|
@@ -73,13 +73,21 @@ public class AmmunitionPlanInformationIntermediateTableServiceImpl implements IA
|
|
|
saleProducts.setOnBoardState(item.getPlanStatus()); //产品状态
|
|
|
saleProducts.setLotNumber(item.getCurrentLotNumber());//批号
|
|
|
saleProducts.setProductNumber(Double.valueOf(item.getNumber()));//数量
|
|
|
- saleProductsList.add(saleProducts);
|
|
|
- //产品对应的信息
|
|
|
- SaleProducts saleProducts1 = saleProductsMapper.selectSaleProductsById(Long.valueOf(item.getProductId()));
|
|
|
+ saleProducts.setColourNumber(item.getColourNumber());//色号编码
|
|
|
+ SaleProducts saleProducts1 = saleProductsMapper.selectSaleProductsById(Long.valueOf(item.getProductId()));//插叙对应产品信息
|
|
|
+ item.setProductTypeName(saleProducts1.getProductName());
|
|
|
+ saleProducts.setTaskName(saleProducts1.getProductName()+item.getCurrentColorCode()); //产品的任务名称
|
|
|
item.setProductTypeName(saleProducts1.getProductName());
|
|
|
item.setCreateBy(SecurityUtils.getUsername());
|
|
|
item.setCreateById(SecurityUtils.getUserId());
|
|
|
item.setCreateTime(new Date());
|
|
|
+ saleProductsList.add(saleProducts);
|
|
|
+ //产品对应的信息
|
|
|
+// SaleProducts saleProducts1 = saleProductsMapper.selectSaleProductsById(Long.valueOf(item.getProductId()));
|
|
|
+// item.setProductTypeName(saleProducts1.getProductName());
|
|
|
+// item.setCreateBy(SecurityUtils.getUsername());
|
|
|
+// item.setCreateById(SecurityUtils.getUserId());
|
|
|
+// item.setCreateTime(new Date());
|
|
|
});
|
|
|
//更新产线
|
|
|
saleProductsList.forEach(item -> {
|