Merge branch 'refs/heads/b_lms' into master_merge

# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java

@@ -756,7 +756,13 @@ public class SlitterServiceImpl implements SlitterService {
         updateWrapper.eq("vehicle_code", device.getVehicle_code())
                 .eq("row_num", param.getString("row_num"))
                 .setSql("qty=qty-1");
-
+        papervehicleService.update(updateWrapper);
+        // 检查更新后的 qty 是否为 0，然后删除相应的记录
+        QueryWrapper<MdPbPapervehicle> deleteWrapper = new QueryWrapper<>();
+        deleteWrapper.eq("vehicle_code", device.getVehicle_code())
+                .eq("row_num", param.getString("row_num"))
+                .eq("qty", "0");
+        papervehicleService.remove(deleteWrapper);
         JSONObject res = new JSONObject();
         res.put("status", HttpStatus.HTTP_OK);
         res.put("message", "请求成功!");

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java

@@ -239,7 +239,7 @@ public class SlitterTaskUtil {
                 .mapToObj(String::valueOf)
                 .toArray(String[]::new);
         param.put("to_material", String.join(",", material_codes));
-        param.put("to_spec", String.join(",", material_codes));
+        param.put("to_spec", String.join(",", material_specs));
         param.put("to_qty", String.join(",", qtysStr));
         param.put("device_code", material_specs);
     }