rev:1、库存可视乎名称修改；2、库存记录可用数、库存数为0问题修改；3、载具新增支持批量新增

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/rest/VehicleController.java

@@ -45,8 +45,8 @@ public class VehicleController {
     @Log("新增载具")
     @ApiOperation("新增载具")
     //@PreAuthorize("@el.check('vehicle:add')")
-    public ResponseEntity<Object> create(@Validated @RequestBody VehicleDto dto) {
+    public ResponseEntity<Object> create(@RequestBody JSONObject form) {
-        vehicleService.create(dto);
+        vehicleService.create(form);
         return new ResponseEntity<>(HttpStatus.CREATED);
     }
 

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/VehicleService.java

@@ -49,9 +49,9 @@ public interface VehicleService {
 
     /**
     * 创建
-    * @param dto /
+    * @param form /
     */
-    void create(VehicleDto dto);
+    void create(JSONObject form);
 
     /**
     * 编辑

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/base/service/impl/VehicleServiceImpl.java

@@ -12,6 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.nl.exception.BadRequestException;
+import org.nl.modules.system.util.CodeUtil;
 import org.nl.utils.FileUtil;
 import org.nl.utils.SecurityUtils;
 import org.nl.wms.st.base.service.VehicleService;
@@ -77,19 +78,27 @@ public class VehicleServiceImpl implements VehicleService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void create(VehicleDto dto) {
+    public void create(JSONObject form) {
-        String currentUsername = SecurityUtils.getCurrentUsername();
+        int vehicle_qty = form.getIntValue("vehicle_qty");
-        String now = DateUtil.now();
+        for (int i = 0; i < vehicle_qty; i++) {
+            VehicleDto dto = form.toJavaObject(VehicleDto.class);
+            String currentUsername = SecurityUtils.getCurrentUsername();
+            String now = DateUtil.now();
 
-        dto.setVehicle_uuid(IdUtil.simpleUUID());
+            String vehicle_code = CodeUtil.getNewCode("VEHICLE_CODE");
-        dto.setCreate_by(currentUsername);
+            dto.setVehicle_code(vehicle_code);
-        dto.setUpdate_by(currentUsername);
+            dto.setVehicle_name(vehicle_code);
-        dto.setUpdate_time(now);
+            dto.setVehicle_uuid(IdUtil.simpleUUID());
-        dto.setCreate_time(now);
+            dto.setCreate_by(currentUsername);
+            dto.setUpdate_by(currentUsername);
+            dto.setUpdate_time(now);
+            dto.setCreate_time(now);
+
+            WQLObject wo = WQLObject.getWQLObject("st_base_vehicle");
+            JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
+            wo.insert(json);
+        }
 
-        WQLObject wo = WQLObject.getWQLObject("st_base_vehicle");
-        JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
-        wo.insert(json);
     }
 
     @Override

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/ivt/StoreIvtServiceImpl.java

@@ -113,10 +113,16 @@ public class StoreIvtServiceImpl {
                     break;
                 case 22:
                     json.put("ivt_qty", change_qty);
+                    json.put("vehicle_code", vehicle_code);
+                    json.put("barcode",param.getString("barcode"));
+                    stackIvtTab.insert(json);
                     break;
                 case 23:
                     json.put("ivt_qty", change_qty);
                     json.put("canuse_qty", change_qty);
+                    json.put("vehicle_code", vehicle_code);
+                    json.put("barcode",param.getString("barcode"));
+                    stackIvtTab.insert(json);
                     break;
                 case 24:// 同时减
                     // 语句
@@ -130,9 +136,7 @@ public class StoreIvtServiceImpl {
                 default: // 可选
                     throw new BadRequestException("变动类型不正确!");
             }
-            json.put("vehicle_code", vehicle_code);
+
-            json.put("barcode",param.getString("barcode"));
-            stackIvtTab.insert(json);
         }
         // 对应的货位上有物料，需判断数量重量相关字段是否符合实际逻辑，符合时更新相应记录
         if (stackIvtObj != null) {
@@ -167,6 +171,9 @@ public class StoreIvtServiceImpl {
                     if (after_canuse_qty.doubleValue() < 0) {
                         throw new BadRequestException("可用数量不足，无法操作!");
                     }
+                    if (after_ivt_qty.doubleValue() <= 0 ) {
+                        is_sub0 = true;
+                    }
                     stackIvtObj.put("canuse_qty", after_canuse_qty);
                     break;
                 case 12:// 12-增加可用重量和数量;

wms/qd/src/views/wms/st/vehicle/index.vue

@@ -24,7 +24,7 @@
         width="500px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
-          <el-form-item label="载具编码" prop="vehicle_code">
+<!--          <el-form-item label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="载具名称" prop="vehicle_name">
@@ -32,6 +32,9 @@
           </el-form-item>
           <el-form-item label="备注">
             <el-input v-model="form.remark" style="width: 370px;" rows="3" type="textarea" />
+          </el-form-item>-->
+          <el-form-item label="新增数量" prop="vehicle_name">
+            <el-input-number v-model="form.vehicle_qty" style="width: 370px;" />
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -98,7 +101,8 @@ const defaultForm = {
   create_by: null,
   create_time: null,
   update_by: null,
-  update_time: null
+  update_time: null,
+  vehicle_qty: null
 }
 export default {
   name: 'Vehicle',
@@ -124,12 +128,6 @@ export default {
         vehicle_uuid: [
           { required: true, message: '载具标识不能为空', trigger: 'blur' }
         ],
-        vehicle_code: [
-          { required: true, message: '载具编码不能为空', trigger: 'blur' }
-        ],
-        vehicle_name: [
-          { required: true, message: '载具名称不能为空', trigger: 'blur' }
-        ],
         is_active: [
           { required: true, message: '是否启用不能为空', trigger: 'blur' }
         ],

wms/qd/src/views/wms/st/visable/index4.vue

@@ -1,9 +1,9 @@
 <template>
   <el-tabs v-model="activeName" style="padding-left: 8px;" @tab-click="tabClick">
-    <el-tab-pane label="聚酯存储区" name="first">
+    <el-tab-pane label="保护膜存储区" name="first">
       <Sect1 ref="sect1" />
     </el-tab-pane>
-    <el-tab-pane label="保护膜存储区" name="second">
+    <el-tab-pane label="聚酯存储区" name="second">
       <Sect2 ref="sect2" />
     </el-tab-pane>
   </el-tabs>