优化内部订单code生成

优化注释

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

@@ -79,11 +79,11 @@ public class ApmsController extends BaseController {
     }
 
     @PostMapping(value = "apmsCompleteOrder")
-    @ApiOperation(value = "APMS完成订单,返回加工单检验结果")
+    @ApiOperation(value = "APMS返回加工单检验结果")
     public R<String> apmsCompleteOrder(@Validated @RequestBody ApmsCompleteOrder apmsCompleteOrder) {
         CommunicationLog communicationLog = new CommunicationLog();
         communicationLog.setCode("APMS" + System.currentTimeMillis());
-        communicationLog.setLogName("APMS完成订单,返回WMS加工单检验结果");
+        communicationLog.setLogName("APMS返回WMS加工单检验结果");
         communicationLog.setType(3);
         communicationLog.setContent(apmsCompleteOrder.toString());
         setCommonField(communicationLog);

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

@@ -35,7 +35,7 @@ public class OrderInfoController extends BaseController {
     private OrderInfoService orderInfoService;
 
     @PostMapping(value = "page")
-    @ApiOperation(value = "订单加工管理-获取分页订单信息")
+    @ApiOperation(value = "订单加工管理-当前订单列表")
     private R<PageVo<OrderInfoVo>> page(@Validated({PageGroup.class, Default.class}) @RequestBody OrderInfoBasePageParam orderBaseParam) {
         return orderInfoService.page(orderBaseParam);
     }
@@ -44,7 +44,7 @@ public class OrderInfoController extends BaseController {
      * 应该没有人工创建信息这个接口
      */
     @PostMapping(value = "personCreateOrder")
-    @ApiOperation(value = "人工创建订单信息")
+    @ApiOperation(value = "人工创建订单信息", hidden = true)
     @Deprecated
     private R<String> personCreateOrder(@Validated({Default.class}) @RequestBody OrderInfoPersonCreateParam orderInfoPersonCreateParam) {
         return orderInfoService.personCreateOrder(orderInfoPersonCreateParam);
@@ -71,7 +71,6 @@ public class OrderInfoController extends BaseController {
 
     @PostMapping(value = "completeOrder")
     @ApiOperation(value = "人工完成订单（不需通知apms，仅在wms完成）")
-    @Deprecated
     private R<String> completeOrder(@Validated @RequestBody IdParam idParam) {
         return orderInfoService.completeOrder(idParam);
     }

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

@@ -19,17 +19,22 @@ import lombok.experimental.Accessors;
 public class OrderParamForApms extends BaseParam {
 
     private static final long serialVersionUID = 1L;
-    
+
     /**
      * 订单号，APMS系统获取
      */
-   @ApiModelProperty(value = "订单号", required = true)
+    @ApiModelProperty(value = "订单号", required = true)
     private String orderNo;
+    /**
+     * 原订单号，一般为空，如果存在信息，则为返工单 APMS系统获取
+     */
+    @ApiModelProperty(value = "原订单号", required = false)
+    private String oldOrderNo;
 
     /**
      * 标识卡号，APMS系统获取
      */
-   @ApiModelProperty(value = "标识卡号", required = true)
+    @ApiModelProperty(value = "标识卡号", required = true)
     private String idenCardNum;
 
     /**

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

@@ -9,6 +9,7 @@ import com.mt.wms.core.dal.service.CurrTaskDetServiceBiz;
 import com.mt.wms.core.dal.service.OrderInfoServiceBiz;
 import com.mt.wms.core.params.IdParam;
 import com.mt.wms.core.utils.BeanUtils;
+import com.mt.wms.core.utils.IDGenerator;
 import com.mt.wms.core.vo.PageVo;
 import com.mt.wms.core.vo.R;
 import com.mt.wms.empty.params.CurrTaskDetQueryParam;
@@ -59,6 +60,7 @@ public class CurrTaskDetServiceImpl extends BaseService implements CurrTaskDetSe
         List<CurrTaskDet> params = BeanUtils.copyList(taskDet, CurrTaskDet.class);
         params.forEach(param -> {
             param.setCurrTaskId(taskId);
+            param.setInterCode(IDGenerator.gen("RWDET", IDGenerator.PATTERN_YYYYMMDDHHMM, 2, "TASK_DET_CODE"));
             setCommonField(param);
         });
         currTaskDetServiceBiz.saveBatch(params);

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

@@ -10,6 +10,7 @@ import com.mt.wms.core.dal.service.CurrTaskServiceBiz;
 import com.mt.wms.core.dal.service.OrderInfoServiceBiz;
 import com.mt.wms.core.params.BasePageParam;
 import com.mt.wms.core.params.IdParam;
+import com.mt.wms.core.utils.IDGenerator;
 import com.mt.wms.core.vo.IdVo;
 import com.mt.wms.core.vo.PageVo;
 import com.mt.wms.core.vo.R;
@@ -94,6 +95,7 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
         CraftInfo one = craftInfoServiceBiz.getOne(new QueryWrapper<CraftInfo>().eq(CraftInfo.CREATOR_ID, param.getCraftCode()));
         currTask.setFCraftCodeId(one.getId());
         currTask.setFPlcValue(one.getPlcValue());
+        currTask.setInterCode(IDGenerator.gen("RW", IDGenerator.PATTERN_YYYYMMDDHHMM, 2, "TASK_CODE"));
         setCommonField(currTask);
         currTaskServiceBiz.save(currTask);
         return successful(IdVo.builder().id(currTask.getId()).build());
@@ -115,6 +117,8 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
         BeanUtils.copyProperties(byId, taskHis);
         taskHis.setStatus(2);
         taskHis.setId(null);
+        taskHis.setInterCode(IDGenerator.gen("RWHIS", IDGenerator.PATTERN_YYYYMMDDHHMM, 2, "TASKHIS_CODE"));
+        setCommonField(taskHis);
         //将主任务放入到历史表，清空id，防止重复
         R<IdVo> save = taskHisService.save(taskHis);
         byId.setValid(0);

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

@@ -19,6 +19,7 @@ import com.mt.wms.core.dal.service.CommunicationLogServiceBiz;
 import com.mt.wms.core.dal.service.OrderInfoServiceBiz;
 import com.mt.wms.core.enums.WhetherEnum;
 import com.mt.wms.core.params.IdParam;
+import com.mt.wms.core.utils.IDGenerator;
 import com.mt.wms.core.vo.PageVo;
 import com.mt.wms.core.vo.R;
 import com.mt.wms.empty.controller.ApmsController;
@@ -87,7 +88,7 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
         setCommonField(orderInfo);
         //设定来源信息为apms
         orderInfo.setOrderSource(OrderSourceEnum.APMS.getValue());
-        orderInfo.setInterCode("APMS" + System.currentTimeMillis());
+        orderInfo.setInterCode(IDGenerator.gen("DD", IDGenerator.PATTERN_YYYYMMDDHHMM, 2, "ORDER_CODE"));
         orderInfoService.save(orderInfo);
         return successful("Wms接收Apms订单成功。");
     }
@@ -236,19 +237,24 @@ public class OrderInfoServiceImpl extends BaseService implements OrderInfoServic
     @Override
     public R<String> completeOrder(IdParam idParam) {
         OrderInfo byId = orderInfoService.getById(idParam.getId());
-        orderInfoHisService.save(byId);
         byId.setValid(0);
         byId.setStatus(2);
         orderInfoService.updateById(byId);
-        return successful("订单状态成功置为完成。");
+        byId.setId(null);
+        byId.setValid(1);
+        byId.setInterCode(IDGenerator.gen("DDHIS", IDGenerator.PATTERN_YYYYMMDDHHMM, 2, "ORDER_HIS_CODE"));
+        setCommonField(byId);
+        orderInfoHisService.save(byId);
+        return successful("成功，订单状态置为完成。");
     }
 
     @Override
     public R<String> voidOrder(IdParam idParam) {
         OrderInfo byId = orderInfoService.getById(idParam.getId());
+        byId.setUpdateTime(LocalDateTime.now());
         byId.setValid(0);
         orderInfoService.updateById(byId);
-        return successful("订单状态成功置为作废。");
+        return successful("成功，订单状态置为作废。");
     }
 
     @Override

6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/OrderInfoVo.java

@@ -28,6 +28,10 @@ public class OrderInfoVo extends BaseVo implements PageVo.ConvertVo {
      */
     @ApiModelProperty(value = "主键")
     private Long id;
+
+    @ApiModelProperty(value = "订单状态")
+    private Integer valid;
+
     /**
      * 来源：1.APMS  2.人工输入
      */