MESNotice 报工功能改进处理

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

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.zuihou.authority.dto.priority.TaskNodePriorityDto;
+import com.github.zuihou.authority.service.common.ParameterService;
 import com.github.zuihou.base.R;
 import com.github.zuihou.base.service.SuperServiceImpl;
 import com.github.zuihou.business.DemoLine.DemoCacheKey;
@@ -45,10 +46,7 @@ import com.github.zuihou.business.util.DynamicRabbitMq;
 import com.github.zuihou.business.util.ManualTaskOperatorUtil;
 import com.github.zuihou.business.util.MsgUtil;
 import com.github.zuihou.business.util.ZplPrinter;
-import com.github.zuihou.common.constant.BizConstant;
-import com.github.zuihou.common.constant.CacheKey;
-import com.github.zuihou.common.constant.CodeRuleModule;
-import com.github.zuihou.common.constant.DictionaryKey;
+import com.github.zuihou.common.constant.*;
 import com.github.zuihou.common.util.DateUtil;
 import com.github.zuihou.common.util.StringUtil;
 import com.github.zuihou.context.BaseContextHandler;
@@ -98,7 +96,7 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
     private TaskService taskService;
 
     @Autowired
-    private AutoNodeService autoNodeService;
+    private ParameterService parameterService;
 
     @Autowired
     private CodeRuleService codeRuleService;
@@ -1881,8 +1879,8 @@ public class TaskNodeServiceImpl extends SuperServiceImpl<TaskNodeMapper, TaskNo
                         orderMapper.updateAllById(order);
 
                         //实现MES的产线生产任务完工
-                        if(order.getSource().equals("2")){
-                            String hostSystemUrl = "http://192.168.11.240";
+                        if(order.getSource().equals("2") && bom.getIsFinalProcess().equals("1")){
+                            String hostSystemUrl = parameterService.getValue(ParameterKey.ECSSYSTEMURL, null);
                             String mesTaskCompletionURL = hostSystemUrl + "/api/authority/cud/ProdReport/productionTaskCompletion";
                             //参数构建
                             JSONObject jsonParam = new JSONObject();

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/externalApi/ProductionTasksController.java

@@ -470,7 +470,7 @@ public class ProductionTasksController {
         proRepItem.put("workOrderNo", workOrderNo);
         proRepItem.put("serialNo", tWorkpiece.getSerialNo());
         OrderQuality orderQuality = orderQualityService.getOne(new LambdaQueryWrapper<OrderQuality>().eq(OrderQuality::getOrderNo, workOrderNo).eq(OrderQuality::getWorkpieceId, tWorkpiece.getCompleteBatchNo()));
-        if(orderQuality!=null) {
+        if(orderQuality==null) {
             proRepItem.put("repConclusionCode", "1");
         }else{
             proRepItem.put("repConclusionCode", orderQuality.getOkFlag().equals("OK")?"1":"0");

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomPageDTO.java

@@ -163,5 +163,8 @@ public class BBomPageDTO implements Serializable {
     @ApiModelProperty(value = "版本")
     private String version;
 
+    @ApiModelProperty(value = "是否最终工序")
+    @Length(max = 6, message = "是否最终工序不能超过6")
+    private String isFinalProcess;
 
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/dto/BBomSaveDTO.java

@@ -123,4 +123,11 @@ public class BBomSaveDTO implements Serializable {
     @ApiModelProperty(value = "材料牌号")
     private Long materialId;
 
+    /**
+     * 是否最终工序
+     */
+    @ApiModelProperty(value = "是否最终工序")
+    @Length(max = 6, message = "是否最终工序长度不能超过6")
+    private String isFinalProcess;
+
 }

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BBom.java

@@ -259,6 +259,11 @@ public class BBom extends Entity<Long> {
     @TableField("remark")
     private String  remark;
 
+    @ApiModelProperty(value = "是否最终工序")
+    @TableField("is_final_process")
+    @Excel(name = "是否最终工序")
+    private String isFinalProcess;
+
     @ApiModelProperty(value = "产线")
     @TableField("zone_id")
     @Excel(name = "产线")
@@ -268,7 +273,7 @@ public class BBom extends Entity<Long> {
 
     @Builder
     public BBom(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
-                    String auditStatus, Long parentId, String name, String no, String status, 
+                    String auditStatus, Long parentId, String name, String no, String status, String isFinalProcess,
                     String model, String brand, String specification, Long moduleId, int synFlag,String groupNo,String furnaceBatchNo,String batchStand) {
         this.id = id;
         this.createTime = createTime;
@@ -285,6 +290,7 @@ public class BBom extends Entity<Long> {
         this.specification = specification;
         this.moduleId = moduleId;
         this.groupNo = groupNo;
+        this.isFinalProcess = isFinalProcess;
         this.batchStand = batchStand;
         this.furnaceBatchNo = furnaceBatchNo;
     }

imcs-admin-boot/imcs-common/src/main/java/com/github/zuihou/common/constant/ParameterKey.java

@@ -75,6 +75,9 @@ public interface ParameterKey {
     //ccs访问网址
     String HOSTSYSTEMURL = "hostSystemUrl";
 
+    //ecs访问网址
+    String ECSSYSTEMURL = "ecsSystemUrl";
+
     //消息队列状态位拦截
     String MQINTERCEPT = "mqIntercept";