Merge remote-tracking branch 'origin/master'

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/MesToLmsController.java

@@ -112,6 +112,14 @@ public class MesToLmsController {
         return new ResponseEntity<>(mesToLmsService.cutPlanTransferCancel(jo), HttpStatus.OK);
     }
 
+    @PostMapping("/sendAuditResult")
+    @Log("子卷审批结果")
+    @ApiOperation("子卷审批结果")
+    @SaIgnore
+    public ResponseEntity<Object> sendAuditResult(@RequestBody JSONObject jo) {
+        return new ResponseEntity<>(mesToLmsService.sendAuditResult(jo), HttpStatus.OK);
+    }
+
 
 
 

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java

@@ -58,4 +58,6 @@ public interface MesToLmsService {
      * 分切计划取消
      */
     JSONObject cutPlanTransferCancel(JSONObject param);
+
+    JSONObject sendAuditResult(JSONObject param);
 }

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java

@@ -1355,4 +1355,12 @@ public class MesToLmsServiceImpl implements MesToLmsService {
         log.info("childRollInfoUpdate接口输出参数为：-------------------" + result.toString());
         return result;
     }
+
+    @Override
+    public JSONObject sendAuditResult(JSONObject param) {
+        String instance_code = param.getString("instance_code");
+        //0-不通过；1-通过；
+        String result = param.getString("result");
+        return null;
+    }
 }