change - add生产计划信息加工作量字段

os-mes/src/main/java/com/os/mes/base/service/impl/BaseDeviceLedgerServiceImpl.java

@@ -135,7 +135,7 @@ public class BaseDeviceLedgerServiceImpl implements IBaseDeviceLedgerService
             List<BaseProductLine> productLineList = baseProductLineMapper.selectBaseProductLineList(productLine);
             if (!productLineList.isEmpty()){
                 BaseProductLine baseProductLine = productLineList.get(0);
-                baseDeviceLedger.setProductLineCode(baseProductLine.getPlantCode());
+                baseDeviceLedger.setProductLineCode(baseProductLine.getProductLineCode());//工位
                 baseDeviceLedger.setProcessCode(baseProductLine.getWorkCenterName());
             }
         }

os-mes/src/main/java/com/os/mes/prod/service/impl/ProdPlanErpInfoServiceImpl.java

@@ -131,13 +131,14 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService {
                 ProdPlanInfo planInfo = planInfoList.get(0);
                 planInfo.setPlanCode(seqNo);
                 planInfo.setOrderCode(planErpInfo.getTaskCode());
-                planInfo.setPlanAmount(planErpInfo.getCustomerRequestConveyorLength());
+                planInfo.setPlanAmount(planErpInfo.getWorkload());
                 planInfo.setPlanBeginTime(planErpInfo.getPlanStartTime());
                 planInfo.setPlanEndTime(planErpInfo.getPlanEndTime());
                 planInfo.setDeviceCode(equipmentNo);
                 planInfo.setProcessCode(planErpInfo.getProcessCode());
                 planInfo.setStationCode(planErpInfo.getStationCode());
                 planInfo.setTeamCode(planErpInfo.getTeamNo());
+                planInfo.setMaterialName(planErpInfo.getConveyorLengthSpecification());
                 prodPlanInfoService.updateProdPlanInfo(planInfo);
                 ProdPlanErpInfo prodPlanErpInfo = infoList.get(0);
                 planErpInfo.setObjId(prodPlanErpInfo.getObjId());
@@ -146,13 +147,14 @@ public class ProdPlanErpInfoServiceImpl implements IProdPlanErpInfoService {
                 ProdPlanInfo planInfo = new ProdPlanInfo();
                 planInfo.setPlanCode(planErpInfo.getSeqNo());
                 planInfo.setOrderCode(planErpInfo.getTaskCode());
-                planInfo.setPlanAmount(planErpInfo.getCustomerRequestConveyorLength());
+                planInfo.setPlanAmount(planErpInfo.getWorkload());
                 planInfo.setDeviceCode(equipmentNo);
                 planInfo.setProcessCode(planErpInfo.getProcessCode());
                 planInfo.setStationCode(planErpInfo.getStationCode());
                 planInfo.setPlanBeginTime(planErpInfo.getPlanStartTime());
                 planInfo.setPlanEndTime(planErpInfo.getPlanEndTime());
                 planInfo.setTeamCode(planErpInfo.getTeamNo());
+                planInfo.setMaterialName(planErpInfo.getConveyorLengthSpecification());
                 planInfo.setPlanStatus("0");
                 planInfo.setImportFlag("1");
                 prodPlanInfoService.insertProdPlanInfo(planInfo);