|
@@ -176,6 +176,23 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
|
|
// saleProducts.setProductionLineNo(detailsOfTheRefuelingPlanSpinning.getMachineId());//产线编号
|
|
// saleProducts.setProductionLineNo(detailsOfTheRefuelingPlanSpinning.getMachineId());//产线编号
|
|
// //改这个产品用的那个产线
|
|
// //改这个产品用的那个产线
|
|
// saleProductsMapper.updateSaleProducts(saleProducts);
|
|
// saleProductsMapper.updateSaleProducts(saleProducts);
|
|
|
|
+ SaleProducts saleProducts=new SaleProducts();
|
|
|
|
+ if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("待机")){
|
|
|
|
+ detailsOfTheRefuelingPlanSpinning.setPlanStatus("0");
|
|
|
|
+ }
|
|
|
|
+ if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("上机")){
|
|
|
|
+ detailsOfTheRefuelingPlanSpinning.setPlanStatus("1");
|
|
|
|
+ }
|
|
|
|
+ if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("停机")){
|
|
|
|
+ detailsOfTheRefuelingPlanSpinning.setPlanStatus("2");
|
|
|
|
+ }
|
|
|
|
+ if(detailsOfTheRefuelingPlanSpinning.getPlanStatus().equals("完成")){
|
|
|
|
+ detailsOfTheRefuelingPlanSpinning.setPlanStatus("3");
|
|
|
|
+ }
|
|
|
|
+ saleProducts.setSaleOrderNo(detailsOfTheRefuelingPlanSpinning.getSalesmanId());//合同号
|
|
|
|
+ saleProducts.setOnBoardState(detailsOfTheRefuelingPlanSpinning.getPlanStatus());//更新上机状态
|
|
|
|
+ //修改产品上机状态
|
|
|
|
+ saleProductsMapper.updateSaleProductsBySaleOrderNo(saleProducts);
|
|
return detailsOfTheRefuelingPlanSpinningMapper.updateDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);
|
|
return detailsOfTheRefuelingPlanSpinningMapper.updateDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -204,25 +221,29 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
|
|
@Override
|
|
@Override
|
|
public int insertDetailsOfTheRefuelingPlanSpinningBatch(List<DetailsOfTheRefuelingPlanSpinning> detailsOfTheRefuelingPlanSpinning) {
|
|
public int insertDetailsOfTheRefuelingPlanSpinningBatch(List<DetailsOfTheRefuelingPlanSpinning> detailsOfTheRefuelingPlanSpinning) {
|
|
//批量插入修改产线号和批号
|
|
//批量插入修改产线号和批号
|
|
- List<SaleOrder> saleOrderList=new ArrayList<>();
|
|
|
|
List<SaleProducts> saleProductsList=new ArrayList<>();
|
|
List<SaleProducts> saleProductsList=new ArrayList<>();
|
|
//改批号,和产线号
|
|
//改批号,和产线号
|
|
detailsOfTheRefuelingPlanSpinning.forEach(item->{
|
|
detailsOfTheRefuelingPlanSpinning.forEach(item->{
|
|
- //改掉某个订单的批号
|
|
|
|
- SaleOrder saleOrder = new SaleOrder();
|
|
|
|
- //当初计划要存,业务员id,后期存的内容是订单号
|
|
|
|
- saleOrder.setSaleNo(item.getSalesmanId().toString());//订单号
|
|
|
|
- saleOrder.setLotNumber(item.getCurrentLotNumber().toString());//批号
|
|
|
|
- saleOrderList.add(saleOrder);
|
|
|
|
//改产品的线号,批号
|
|
//改产品的线号,批号
|
|
SaleProducts saleProducts=new SaleProducts();
|
|
SaleProducts saleProducts=new SaleProducts();
|
|
saleProducts.setId(Long.valueOf(item.getProductId()));
|
|
saleProducts.setId(Long.valueOf(item.getProductId()));
|
|
saleProducts.setProductionLineNo(item.getMachineId());
|
|
saleProducts.setProductionLineNo(item.getMachineId());
|
|
saleProducts.setLotNumber(item.getCurrentLotNumber().toString());//批号
|
|
saleProducts.setLotNumber(item.getCurrentLotNumber().toString());//批号
|
|
|
|
+ if(item.getPlanStatus().equals("待机")){
|
|
|
|
+ item.setPlanStatus("0");
|
|
|
|
+ }
|
|
|
|
+ if(item.getPlanStatus().equals("上机")){
|
|
|
|
+ item.setPlanStatus("1");
|
|
|
|
+ }
|
|
|
|
+ if(item.getPlanStatus().equals("停机")){
|
|
|
|
+ item.setPlanStatus("2");
|
|
|
|
+ }
|
|
|
|
+ if(item.getPlanStatus().equals("完成")){
|
|
|
|
+ item.setPlanStatus("3");
|
|
|
|
+ }
|
|
|
|
+ saleProducts.setOnBoardState(item.getPlanStatus());//状态信息
|
|
saleProductsList.add(saleProducts);
|
|
saleProductsList.add(saleProducts);
|
|
});
|
|
});
|
|
- //更新批号
|
|
|
|
- int i1 = saleOrderMapper.updateSaleOrderBatch(saleOrderList);
|
|
|
|
//更新产线
|
|
//更新产线
|
|
int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
|
|
int i2 = saleProductsMapper.updateSaleProductBatch(saleProductsList);
|
|
return detailsOfTheRefuelingPlanSpinningMapper.insertBatchDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);
|
|
return detailsOfTheRefuelingPlanSpinningMapper.insertBatchDetailsOfTheRefuelingPlanSpinning(detailsOfTheRefuelingPlanSpinning);
|