细节修改

6.program/wms-empty/src/main/java/com/mt/wms/empty/controller/CurrTaskController.java

@@ -264,8 +264,8 @@ public class CurrTaskController extends BaseController {
 
     @PostMapping(value = "deleteBySheetNo")
     @ApiOperation(value = "人工通过生产单编号删除未正式开始的生产单(通知APMS)")
-    public R<String> deleteBySheetNo(@Validated @RequestBody String sheetNo) {
-        return currTaskService.deleteBySheetNo(sheetNo);
+    public R<String> deleteBySheetNo(@Validated @RequestBody CurrTaskQueryParam param) {
+        return currTaskService.deleteBySheetNo(param.getSheetNo());
     }
     @PostMapping(value = "runTask")
     @ApiOperation(value = "执行任务")

6.program/wms-empty/src/main/java/com/mt/wms/empty/params/CurrTaskQueryParam.java

@@ -23,4 +23,7 @@ public class CurrTaskQueryParam extends BasePageParam {
    @ApiModelProperty(value = "车辆id")
     private String vehicleId;
 
+   private String sheetNo;
+
+
 }

6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java

@@ -76,6 +76,8 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
     RunTaskUtils runTaskUtils;
     @Autowired
     AutoExeTaskServiceBiz autoExeTaskServiceBiz;
+    @Autowired
+    KilnInfoServiceBiz kilnInfoServiceBiz;
 
     @Override
     public CurrTaskVo getCurrTask(IdParam idParam) {
@@ -101,9 +103,11 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
         CurrTask currTask = new CurrTask();
         BeanUtils.copyProperties(param, currTask);
         currTask.setTaskType(TaskTypeEnum.WTK.getValue());
+        KilnInfo kilnInfo = kilnInfoServiceBiz.getById(currTask.getKilnId());
+
         //根据工艺号查询工艺id以及工艺plc值
-        // TODO: 2022/7/7  工艺号临时
-        CraftInfo one = craftInfoServiceBiz.getOne(new QueryWrapper<CraftInfo>().eq(CraftInfo.CRAFT_CODE, 1));
+        CraftInfo one = craftInfoServiceBiz.getOne(new QueryWrapper<CraftInfo>().eq(CraftInfo.CRAFT_CODE, param.getCraftCode()));
+        currTask.setTargetPosition(kilnInfo.getCode());
         currTask.setCraftCodeId(one.getId());
         currTask.setPlcValue(one.getPlcValue());
         currTask.setInterCode(IDGenerator.gen("RW", IDGenerator.PATTERN_YYYYMMDDHHMM, 2, "TASK_CODE"));
@@ -163,6 +167,9 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
                 return failed(apmsStartProcessR.getData().getMsg());
             }
         }
+        if (byId.getStatus()==2){
+            return failed("无法删除，任务已加工完成。");
+        }
         return failed("无法删除，任务正在执行中。");
 
     }

6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/OrderInfoServiceImpl.java

@@ -165,8 +165,8 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
         PageVo<OrderInfoTaskDetVo> currOrderCurrTask = currTaskDetService.getCurrOrderCurrTask(param);
         Assert.notNull("该订单暂无详细任务记录。", currOrderCurrTask.getRecords());
         //获取车辆信息
-        R<List<VehicleVo>> vehicle = vehicleService.list(new VehicleQueryParam());
-        Map<Long, List<VehicleVo>> collect = vehicle.getData().stream().collect(Collectors.groupingBy(VehicleVo::getId));
+        //R<List<VehicleVo>> vehicle = vehicleService.list(new VehicleQueryParam());
+        //Map<Long, List<VehicleVo>> collect = vehicle.getData().stream().collect(Collectors.groupingBy(VehicleVo::getId));
         //获取窑炉信息
         R<List<KilnInfoVo>> kiln = kilnInfoService.list(new KilnInfoQueryParam());
         Map<Long, List<KilnInfoVo>> collect2 = kiln.getData().stream().collect(Collectors.groupingBy(KilnInfoVo::getId));
@@ -181,6 +181,7 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
                     orderInfo.setKilnId(currTask.getKilnId());
                     orderInfo.setStartPosition(currTask.getStartPosition());
                     orderInfo.setTargetPosition(currTask.getTargetPosition());
+                    orderInfo.setTaskCode(currTask.getTaskCode());
                     //orderInfo.setVehicleId(currTask.getVehicleId());
                     //获取窑炉和车辆的名称信息
                     if (orderInfo.getKilnId() != null)

6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java

@@ -148,7 +148,7 @@ public class AsynRunTaskService extends BaseService {
             vehicle.setStatus(0);
             vehicleInfoServiceBiz.updateById(vehicle);
             // TODO: 2022/7/6  上报apms加工单开始
-            //apmsStartProcess(currTask);
+            apmsStartProcess(currTask);
 
         }else {
             runTask.setStatus(3);
@@ -217,7 +217,7 @@ public class AsynRunTaskService extends BaseService {
         //执行成功,托盘进炉
         if (status==1){
             // TODO: 2022/7/7
-            //asynStartRecordConsume(currTaskId,currTask.getKilnId());
+            asynStartRecordConsume(currTaskId,currTask.getKilnId());
             logger.info("===执行任务："+currTaskId+" ，车辆搬运任务，车辆："+vehicleId+" ，起点："+startPoint+" ,终点："+endPoint+"任务执行成功===");
             //更新调度表状态为完成
             runTask.setUpdateTime(LocalDateTime.now());
@@ -244,7 +244,7 @@ public class AsynRunTaskService extends BaseService {
             vehicle.setStatus(0);
             vehicleInfoServiceBiz.updateById(vehicle);
             // TODO: 2022/7/6  上报apms生产单开始加工
-            //apmsStartProcess(currTask);
+            apmsStartProcess(currTask);
         }else {
             runTask.setStatus(3);
             runTask.setUpdateTime(LocalDateTime.now());
@@ -417,7 +417,7 @@ public class AsynRunTaskService extends BaseService {
         if (status==1){
 
             // TODO: 2022/7/7  加工完成，记录结束时能源消耗
-            //asynEndRecordConsume(currTaskId,currTask.getKilnId());
+            asynEndRecordConsume(currTaskId,currTask.getKilnId());
             logger.info("===执行任务："+currTaskId+" ，车辆搬运任务，车辆："+vehicleId+" ，起点："+startPoint+" ,终点："+endPoint+"任务执行成功===");
             //更新关系表状态为完成
             runTask.setUpdateTime(LocalDateTime.now());
@@ -437,7 +437,8 @@ public class AsynRunTaskService extends BaseService {
             vehicle.setStatus(0);
             vehicleInfoServiceBiz.updateById(vehicle);
             // TODO: 2022/7/6  上报apms加工完成
-/*            ApmsEndProcess apmsEndProcess=new ApmsEndProcess();
+            logger.info("任务："+currTaskId+" 生产单号："+currTask.getSheetNo()+"开始上报apm完成处理生产单！");
+            ApmsEndProcess apmsEndProcess=new ApmsEndProcess();
             apmsEndProcess.setEndTime(LocalDateTime.now().toString());
             apmsEndProcess.setEndUser("QJJP03");
             apmsEndProcess.setSheetNo(currTask.getSheetNo());
@@ -458,6 +459,7 @@ public class AsynRunTaskService extends BaseService {
                     return;
                 }
             }
+            logger.info("任务："+currTask.getTaskCode()+"开始上报apms完成生产单！");
             ApmsFinishProcessSheet apmsFinishProcessSheet=new ApmsFinishProcessSheet();
             apmsFinishProcessSheet.setSheetNo(currTask.getSheetNo());
             apmsFinishProcessSheet.setEndTime(LocalDateTime.now().toString());
@@ -477,7 +479,7 @@ public class AsynRunTaskService extends BaseService {
             R<ApmsFinishProcessSheetVo> apmsFinishProcessSheetVoR = apmsController.finishProcessSheet(apmsFinishProcessSheet);
             if (apmsFinishProcessSheetVoR.getCode()!=0){
                 logger.info("任务："+currTask.getTaskCode()+"完成后上报apms完成生产单失败！");
-            }*/
+            }
         }else {
             runTask.setStatus(3);
             runTask.setUpdateTime(LocalDateTime.now());
@@ -581,7 +583,7 @@ public class AsynRunTaskService extends BaseService {
         PlcNameSpace nameSpace = plcNameSpaceServiceBiz.getOne(new QueryWrapper<PlcNameSpace>()
                 .eq(PlcNameSpace.EQ_ID, kilnId)
                 .eq(PlcNameSpace.EQ_TYPE, 0));
-        String nameSpaceNote = nameSpace.getNote();
+        String nameSpaceNote = nameSpace.getName();
         switch (kilnInfo.getType()){
             //加工炉
             case 1:
@@ -600,7 +602,7 @@ public class AsynRunTaskService extends BaseService {
                 parTemValue.setOilTankActTemValue(actualOilTemp.floatValue());
                 parTemValue.setKilnId(kilnId);
                 parTemValue.setTaskId(currTaskId);
-                setCommonField(parTemValue);
+                parTemValue.setCreateTime(LocalDateTime.now());
                 parTemValueServiceBiz.save(parTemValue);
                 //电度值
                 Double electricalValue = readPlc(nameSpaceNote,"ElectricalValue");
@@ -615,7 +617,7 @@ public class AsynRunTaskService extends BaseService {
                 parEleValue.setTotalBat(electricalValue.floatValue());
                 parEleValue.setKilnId(kilnId);
                 parEleValue.setTaskId(currTaskId);
-                setCommonField(parEleValue);
+                parEleValue.setCreateTime(LocalDateTime.now());
                 parEleValueServiceBiz.save(parEleValue);
                 //一号油搅拌转速
                 Double oilStirringSpeed1 = readPlc(nameSpaceNote, "OilStirringSpeed1");
@@ -626,7 +628,7 @@ public class AsynRunTaskService extends BaseService {
                 parRotSpeedValue.setOilStiSpeedAValue(oilStirringSpeed2.floatValue());
                 parRotSpeedValue.setKilnId(kilnId);
                 parRotSpeedValue.setTaskId(currTaskId);
-                setCommonField(parRotSpeedValue);
+                parRotSpeedValue.setCreateTime(LocalDateTime.now());
                 parRotSpeedValueServiceBiz.save(parRotSpeedValue);
                 //氮气
                 Double nitrogenFlow = readPlc(nameSpaceNote, "NitrogenFlow");
@@ -649,7 +651,7 @@ public class AsynRunTaskService extends BaseService {
                 parGasValue.setSetNitPotValue(setupCarbon.floatValue());
                 parGasValue.setKilnId(kilnId);
                 parGasValue.setTaskId(currTaskId);
-                setCommonField(parGasValue);
+                parGasValue.setCreateTime(LocalDateTime.now());
                 parGasValueServiceBiz.save(parGasValue);
                 break;
             //回火炉
@@ -663,7 +665,7 @@ public class AsynRunTaskService extends BaseService {
                 parTemValue2.setActTemValue(actualTemp.floatValue());
                 parTemValue2.setKilnId(kilnId);
                 parTemValue2.setTaskId(currTaskId);
-                setCommonField(parTemValue2);
+                parTemValue2.setCreateTime(LocalDateTime.now());
                 parTemValueServiceBiz.save(parTemValue2);
                 //电度值
                 electricalValue = readPlc(nameSpaceNote,"TotalElectricity");
@@ -678,7 +680,7 @@ public class AsynRunTaskService extends BaseService {
                 parEleValue2.setTotalBat(electricalValue.floatValue());
                 parEleValue2.setKilnId(kilnId);
                 parEleValue2.setTaskId(currTaskId);
-                setCommonField(parEleValue2);
+                parEleValue2.setCreateTime(LocalDateTime.now());
                 parEleValueServiceBiz.save(parEleValue2);
                 break;
             //氮化炉
@@ -701,7 +703,7 @@ public class AsynRunTaskService extends BaseService {
                 parTemValue3.setFurnacePressure(furnacePressure.floatValue());
                 parTemValue3.setKilnId(kilnId);
                 parTemValue3.setTaskId(currTaskId);
-                setCommonField(parTemValue3);
+                parTemValue3.setCreateTime(LocalDateTime.now());
                 parTemValueServiceBiz.save(parTemValue3);
                 //电度值
                 electricalValue = readPlc(nameSpaceNote,"ElectricalValue");
@@ -716,7 +718,7 @@ public class AsynRunTaskService extends BaseService {
                 parEleValue3.setTotalBat(electricalValue.floatValue());
                 parEleValue3.setKilnId(kilnId);
                 parEleValue3.setTaskId(currTaskId);
-                setCommonField(parEleValue3);
+                parEleValue3.setCreateTime(LocalDateTime.now());
                 parEleValueServiceBiz.save(parEleValue3);
                 //实际氮势
                 actualCarbon = readPlc(nameSpaceNote, "ActualCarbon");
@@ -741,7 +743,7 @@ public class AsynRunTaskService extends BaseService {
                 parGasValue3.setDecompositionRate(decompositionRate.floatValue());
                 parGasValue3.setKilnId(kilnId);
                 parGasValue3.setTaskId(currTaskId);
-                setCommonField(parGasValue3);
+                parGasValue3.setCreateTime(LocalDateTime.now());
                 parGasValueServiceBiz.save(parGasValue3);
                 break;
             //清洗炉
@@ -759,7 +761,7 @@ public class AsynRunTaskService extends BaseService {
                 parEleValue4.setTotalBat(electricalValue.floatValue());
                 parEleValue4.setKilnId(kilnId);
                 parEleValue4.setTaskId(currTaskId);
-                setCommonField(parEleValue4);
+                parEleValue4.setCreateTime(LocalDateTime.now());
                 parEleValueServiceBiz.save(parEleValue4);
                 break;
             default:
@@ -773,7 +775,7 @@ public class AsynRunTaskService extends BaseService {
         PlcNameSpace nameSpace = plcNameSpaceServiceBiz.getOne(new QueryWrapper<PlcNameSpace>()
                 .eq(PlcNameSpace.EQ_ID, kilnId)
                 .eq(PlcNameSpace.EQ_TYPE, 0));
-        String nameSpaceNote = nameSpace.getNote();
+        String nameSpaceNote = nameSpace.getName();
         switch (kilnInfo.getType()){
             //加工炉
             case 1:
@@ -792,7 +794,7 @@ public class AsynRunTaskService extends BaseService {
                 parTemValue.setOilTankActTemValue(actualOilTemp.floatValue());
                 parTemValue.setKilnId(kilnId);
                 parTemValue.setTaskId(currTaskId);
-                setCommonField(parTemValue);
+                parTemValue.setCreateTime(LocalDateTime.now());
                 parTemValueServiceBiz.save(parTemValue);
                 //电度值
                 Double electricalValue = readPlc(nameSpaceNote,"ElectricalValue");
@@ -807,7 +809,7 @@ public class AsynRunTaskService extends BaseService {
                 parEleValue.setTotalBat(electricalValue.floatValue());
                 parEleValue.setKilnId(kilnId);
                 parEleValue.setTaskId(currTaskId);
-                setCommonField(parEleValue);
+                parEleValue.setCreateTime(LocalDateTime.now());
                 parEleValueServiceBiz.save(parEleValue);
                 //一号油搅拌转速
                 Double oilStirringSpeed1 = readPlc(nameSpaceNote, "OilStirringSpeed1");
@@ -818,7 +820,7 @@ public class AsynRunTaskService extends BaseService {
                 parRotSpeedValue.setOilStiSpeedAValue(oilStirringSpeed2.floatValue());
                 parRotSpeedValue.setKilnId(kilnId);
                 parRotSpeedValue.setTaskId(currTaskId);
-                setCommonField(parRotSpeedValue);
+                parRotSpeedValue.setCreateTime(LocalDateTime.now());
                 parRotSpeedValueServiceBiz.save(parRotSpeedValue);
                 //氮气
                 Double nitrogenFlow = readPlc(nameSpaceNote, "NitrogenFlow");
@@ -841,7 +843,7 @@ public class AsynRunTaskService extends BaseService {
                 parGasValue.setSetNitPotValue(setupCarbon.floatValue());
                 parGasValue.setKilnId(kilnId);
                 parGasValue.setTaskId(currTaskId);
-                setCommonField(parGasValue);
+                parGasValue.setCreateTime(LocalDateTime.now());
                 parGasValueServiceBiz.save(parGasValue);
                 break;
             //回火炉
@@ -855,7 +857,7 @@ public class AsynRunTaskService extends BaseService {
                 parTemValue2.setActTemValue(actualTemp.floatValue());
                 parTemValue2.setKilnId(kilnId);
                 parTemValue2.setTaskId(currTaskId);
-                setCommonField(parTemValue2);
+                parTemValue2.setCreateTime(LocalDateTime.now());
                 parTemValueServiceBiz.save(parTemValue2);
                 //电度值
                 electricalValue = readPlc(nameSpaceNote,"TotalElectricity");
@@ -870,7 +872,7 @@ public class AsynRunTaskService extends BaseService {
                 parEleValue2.setTotalBat(electricalValue.floatValue());
                 parEleValue2.setKilnId(kilnId);
                 parEleValue2.setTaskId(currTaskId);
-                setCommonField(parEleValue2);
+                parEleValue2.setCreateTime(LocalDateTime.now());
                 parEleValueServiceBiz.save(parEleValue2);
                 break;
             //氮化炉
@@ -893,7 +895,7 @@ public class AsynRunTaskService extends BaseService {
                 parTemValue3.setFurnacePressure(furnacePressure.floatValue());
                 parTemValue3.setKilnId(kilnId);
                 parTemValue3.setTaskId(currTaskId);
-                setCommonField(parTemValue3);
+                parTemValue3.setCreateTime(LocalDateTime.now());
                 parTemValueServiceBiz.save(parTemValue3);
                 //电度值
                 electricalValue = readPlc(nameSpaceNote,"ElectricalValue");
@@ -908,7 +910,7 @@ public class AsynRunTaskService extends BaseService {
                 parEleValue3.setTotalBat(electricalValue.floatValue());
                 parEleValue3.setKilnId(kilnId);
                 parEleValue3.setTaskId(currTaskId);
-                setCommonField(parEleValue3);
+                parEleValue3.setCreateTime(LocalDateTime.now());
                 parEleValueServiceBiz.save(parEleValue3);
                 //实际氮势
                 actualCarbon = readPlc(nameSpaceNote, "ActualCarbon");
@@ -933,7 +935,7 @@ public class AsynRunTaskService extends BaseService {
                 parGasValue3.setDecompositionRate(decompositionRate.floatValue());
                 parGasValue3.setKilnId(kilnId);
                 parGasValue3.setTaskId(currTaskId);
-                setCommonField(parGasValue3);
+                parGasValue3.setCreateTime(LocalDateTime.now());
                 parGasValueServiceBiz.save(parGasValue3);
                 break;
             //清洗炉
@@ -951,7 +953,7 @@ public class AsynRunTaskService extends BaseService {
                 parEleValue4.setTotalBat(electricalValue.floatValue());
                 parEleValue4.setKilnId(kilnId);
                 parEleValue4.setTaskId(currTaskId);
-                setCommonField(parEleValue4);
+                parEleValue4.setCreateTime(LocalDateTime.now());
                 parEleValueServiceBiz.save(parEleValue4);
                 break;
             default:

6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java

@@ -123,7 +123,7 @@ public class ScheduledTask extends BaseService {
     /**
      * 正在加工的加工任务详情
      */
-    //@Scheduled(fixedDelay = 1000*60)
+    @Scheduled(fixedDelay = 1000*60)
     public void screen() throws IOException {
         //查询出正在进炉加工的curr_task,查询对应炉号是否Working,查询计划时间，剩余时间，查询标识卡详情
         List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>().eq(CurrTask.IS_IN, 1));
@@ -148,15 +148,15 @@ public class ScheduledTask extends BaseService {
                 //剩余时间
                 Integer remainingTime=0;
                 if (kilnInfo.getType()!=4){
-                    remainingTime = Integer.parseInt(readPlcToString(nameSpace, "ProgramTimeRemain"));
+                    remainingTime = Integer.parseInt(readPlc(nameSpace, "ProgramTimeRemain").toString());
                 }
                 if(kilnInfo.getType()==1||kilnInfo.getType()==3){
                     //运行时间
-                    Integer runTime = Integer.parseInt(readPlcToString(nameSpace, "ProgramRunTime"));
+                    Integer runTime = Integer.parseInt(readPlc(nameSpace, "ProgramRunTime").toString());
                     setupTime=runTime+remainingTime;
                 }
                 if (kilnInfo.getType()==2){
-                    setupTime=Integer.parseInt(readPlcToString(nameSpace, "SetTime"));
+                    setupTime=Integer.parseInt(readPlc(nameSpace, "SetTime").toString());
                 }
                 nowCurrTask.setSetupTime(setupTime);
                 nowCurrTask.setRemainingTime(remainingTime);
@@ -179,7 +179,7 @@ public class ScheduledTask extends BaseService {
     /**
      * 查询加工完成的窑炉
      */
-    //@Scheduled(fixedDelay = 1000*60*2)
+    @Scheduled(fixedDelay = 1000*60*2)
     public void taskForStockToKiln() throws IOException {
         //两辆车是否都空闲，只有两辆车都空闲才被允许做任务
         List<VehicleInfo> vehicleInfoList = vehicleInfoServiceBiz.list(new QueryWrapper<VehicleInfo>().eq(VehicleInfo.STATUS, 0));