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

2024-03-21 10:13:37 +08:00
parent c1b6bee8f8 0dee6fed5d
commit 00088cc2e3
32 changed files with 342 additions and 127 deletions
--- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/MaterialbaseController.java
@@ -22,7 +22,6 @@ import java.util.Map;
 **/
@RestController
@RequiredArgsConstructor
-
@RequestMapping("/api/Materialbase")
@Slf4j
 public class MaterialbaseController {
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java
@@ -118,7 +118,7 @@ public class CheckOutBillController {
    }

    @PostMapping("/allDivOne")
-    @Log("出库单全部分2配")
+    @Log("出库单自动分配")

    public ResponseEntity<Object> allDivOne(@RequestBody JSONObject whereJson) {
        if (whereJson.getString("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {