Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java

@@ -197,4 +197,11 @@ public class AcsToWmsController {
     public ResponseEntity<Object> feedbackSubVolumeWeightApply(@RequestBody JSONObject param) {
         return new ResponseEntity<>(acsToWmsService.feedbackSubVolumeWeightApply(param), HttpStatus.OK);
     }
+
+    @PostMapping("/applicationForLabeling")
+    @Log(value = "二期输送线申请贴标", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS)
+    @SaIgnore
+    public ResponseEntity<Object> applicationForLabeling(@RequestBody JSONObject param) {
+        return new ResponseEntity<>(acsToWmsService.applicationForLabeling(param), HttpStatus.OK);
+    }
 }

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java

@@ -188,4 +188,11 @@ public interface AcsToWmsService {
      * @return /
      */
     JSONObject feedbackSubVolumeWeightApply(JSONObject param);
+
+    /**
+     * 二期输送机申请贴标
+     * @param param /
+     * @return /
+     */
+    JSONObject applicationForLabeling(JSONObject param);
 }

lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@@ -2140,4 +2140,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
         return res;
     }
 
+    @Override
+    public JSONObject applicationForLabeling(JSONObject param) {
+        return param;
+    }
+
 }