后端功能更新

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/mq/TaskWorkNode.java

@@ -403,6 +403,10 @@ public class TaskWorkNode {
                             Order order = orderMapper.selectById(tTask.getOrderId());
                             order.setCompleteNum(1).setProduceStatus("3");//完成
                             orderMapper.updateAllById(order);
+                            AAutoNodeLog autoNodeLog = autoNodeLogService.getOne(new LbqWrapper<AAutoNodeLog>().eq(AAutoNodeLog::getTaskNodeId, taskNode.getId()).eq(AAutoNodeLog::getExeStatus, "2").last("limit 1"));
+                            autoNodeLog.setExeStatus("3").setExeResult("1").setEndTime(new Date()).setSendStatus("2").setExecuteTime(new Date());
+                            autoNodeLogService.updateAllById(autoNodeLog);
+
                             //自定义订单非刀具后续处理
                             if(order.getSingleTaskFlag().equals("1") && !order.getOrderName().contains("cutToolOrder")){
                                 taskNodeService.remove(new LbqWrapper<TaskNode>().eq(TaskNode::getCompleteBatchNo, taskNode.getCompleteBatchNo()));

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/OrderServiceImpl.java

@@ -238,6 +238,7 @@ public class OrderServiceImpl extends SuperServiceImpl<OrderMapper, Order> imple
         order.setDeliveryTime(DateUtil.stringToDate3(data.get("deliveryTime").toString()));
         order.setOrderTime(DateUtil.stringToDate3(data.get("orderTime").toString()));
         order.setSingleRunFlag(data.get("singleRunFlag")==null ? 1: Integer.parseInt(data.get("singleRunFlag").toString()));
+        order.setSingleTaskFlag(data.get("singleTaskFlag")==null ? 0: Integer.parseInt(data.get("singleTaskFlag").toString()));
         super.save(order);
 
         int productNum = 0;

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/dto/OrderSaveDTO.java

@@ -152,6 +152,13 @@ public class OrderSaveDTO implements Serializable {
     @Length(max = 1, message = "线内单据运行标志(0-全流程 1-线内单独运行)长度不能超过1")
     private String singleRunFlag;
 
+    /**
+     * 自定义订单运行标志
+     */
+    @ApiModelProperty(value = "自定义订单运行标志(0-否 1-是)")
+    @Length(max = 1, message = "自定义订单运行标志(0-否 1-是)长度不能超过1")
+    private String singleTaskFlag;
+
     /**
      * 明细列表
      */

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/Order.java

@@ -214,6 +214,15 @@ public class Order extends Entity<Long> {
     @Excel(name = "线内单据运行标志(0-全流程 1-线内单独运行)")
     private Integer singleRunFlag;
 
+    /**
+     * 线内单据运行标志(1-待生产2-生产中3-暂停4-已完成)
+     */
+    @ApiModelProperty(value = "自定义订单运行标志")
+    @Length(max = 1, message = "自定义订单运行标志(0-非 1-是)长度不能超过1")
+    @TableField(value = "single_task_flag", condition = LIKE)
+    @Excel(name = "自定义订单运行标志(0-非 1-是)")
+    private Integer singleTaskFlag;
+
     @ApiModelProperty(value = "客户名称")
     @TableField(exist = false)
     private String custDesc;