1、单据作业增加关闭原因、关闭时间、关闭操作人员

2、返修增加维修明细时维修判定枚举更改为页面维护，涉及修改查询报表：修理品票明细报表、维修记录报表；（工程不良报表影响最大，修改大，暂不修改）

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckDetailService.java

@@ -73,7 +73,7 @@ public class TorqueManageCheckDetailService implements ITorqueManageCheckService
         }
 
         // 前端未判断点检结果则后端进行判断
-        if (torqueManageTaskDetail.getCheckResult() == null || torqueManageTaskDetail.getCheckResult() == 0) {
+        if ((torqueManageTaskDetail.getCheckResult() == null || torqueManageTaskDetail.getCheckResult() == 0) && "该项不需要点检".equals(torqueManageTaskDetail.getRemark())) {
             // 未维护上下限的情况
             if (!StringUtils.isEmpty(torqueManageTaskDetail.getUpLimit()) && !StringUtils.isEmpty(torqueManageTaskDetail.getDownLimit())) {
 

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/TorqueManageCheckService.java

@@ -232,19 +232,19 @@ public class TorqueManageCheckService implements IWorkOrderStartService {
 
         StringJoiner key = new StringJoiner(MesPcnExtConstWords.COLON).add("MES-PAUSE-ORDER").add(workOrderExt.getOrderNo());
 
-        String workCenterWoPauseKey = new StringJoiner(MesPcnExtConstWords.COLON).add("MES-PAUSE-ORDER").add(workOrderExt.getWorkCenterCode()).toString();
+        //String workCenterWoPauseKey = new StringJoiner(MesPcnExtConstWords.COLON).add("MES-PAUSE-ORDER").add(workOrderExt.getWorkCenterCode()).toString();
 
         //String workOrderNo = (String) redisMesPcn.getObject(workCenterWoPauseKey);
-        //
-        //String pauseOrderKey = (String) redisMesPcn.getObject(key);
 
-        //if (StringUtils.isEmpty(pauseOrderKey)) {
-        //    msg = String.format("扭矩管理点检生成单据:工单[%s]在一分钟内有过暂停操作，操作频繁，等待一分钟后可再生成扭矩管理点检单", workOrderExt.getOrderNo());
-        //    log.info(msg);
-        //    checkErrorLogService.insertCheckErrorLog(checkErrorLog, msg, userInfo);
-        //    return true;
-        //}
-        //
+        String pauseOrderKey = (String) redisMesPcn.getObject(key);
+
+        if (!StringUtils.isEmpty(pauseOrderKey) && pauseOrderKey.equals(workOrderExt.getOrderNo())) {
+            msg = String.format("扭矩管理点检生成单据:工单[%s]在一分钟内有过暂停操作，操作频繁，等待一分钟后可再生成扭矩管理点检单", workOrderExt.getOrderNo());
+            log.info(msg);
+            checkErrorLogService.insertCheckErrorLog(checkErrorLog, msg, userInfo);
+            return true;
+        }
+
         //if (!StringUtils.isEmpty(workOrderNo) && workOrderNo.equals(workOrderExt.getOrderNo())) {
         //
         //    DdlPackBean packBean = DdlPackBean.getDdlPackBean(workOrderExt.getOrganizeCode());

modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesProcessTorqueManageTaskDetail.java

@@ -215,4 +215,8 @@ public class MesProcessTorqueManageTaskDetail extends BaseBean implements Serial
     @ApiParam("全称扭矩螺丝刀-扭矩管理NO3")
     private String torqueManageNo3Full;
 
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
+    public String remark;
+
 }