代码更新

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java

@@ -11,6 +11,7 @@ import org.nl.wql.core.bean.WQLObject;
 import org.nl.wql.util.WqlUtil;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Map;
 
@@ -37,6 +38,7 @@ public class KilnServiceImpl implements KilnService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void update(JSONObject jsonObject) {
         // 基础信息
         Long currentUserId = SecurityUtils.getCurrentUserId();
@@ -70,6 +72,9 @@ public class KilnServiceImpl implements KilnService {
         if (point_status.equals("00")) { // 空位
             // 删除仓位库存
             structIvtTab.delete("struct_id = '" + jsonObject.getString("struct_id") + "'");
+            if (ObjectUtil.isNotEmpty(vehicleGroupObj)) // 组盘不为空则删除组盘信息以及设置载具编码为空
+                vehicleGroupTab.delete(vehicleGroupObj);
+            vehicle_code = null;
         } else if (point_status.equals("01")) { // 空载具
             // 删除组盘
             if (ObjectUtil.isNotEmpty(vehicleGroupObj))
@@ -142,7 +147,7 @@ public class KilnServiceImpl implements KilnService {
         JSONObject point = pointTab.query("point_id = '" + jsonObject.getString("point_id") + "'").uniqueResult(0);
         point.put("point_status", point_status);
         point.put("lock_type", jsonObject.getString("lock_type"));
-        point.put("vehicle_code", jsonObject.getString("vehicle_code"));
+        point.put("vehicle_code", vehicle_code);
         pointTab.update(point);
     }
 }

wms/qd/src/views/wms/st/basedata/inkilncache/index.vue

@@ -100,7 +100,7 @@
           <el-form-item label="点位名称" prop="point_name">
             <el-input v-model="form.point_name" style="width: 370px;" disabled/>
           </el-form-item>
-          <el-form-item v-if="form.point_status=='01' || form.point_status=='02'" label="载具编码">
+          <el-form-item v-if="form.point_status=='01' || form.point_status=='02'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item label="库存数" prop="ivt_qty" v-if="form.point_status=='02'">
@@ -238,6 +238,9 @@ export default {
         point_type: [
           { required: true, message: '点位类型不能为空', trigger: 'blur' }
         ],
+        vehicle_code: [
+          { required: true, message: '载具编码不能为空', trigger: 'blur' }
+        ],
         point_status: [
           { required: true, message: '点位状态不能为空', trigger: 'blur' }
         ],

wms/qd/src/views/wms/st/basedata/outkilncache/index.vue

@@ -100,7 +100,7 @@
           <el-form-item label="点位名称" prop="point_name">
             <el-input v-model="form.point_name" style="width: 370px;" disabled />
           </el-form-item>
-          <el-form-item v-if="form.point_status=='01' || form.point_status=='02'" label="载具编码">
+          <el-form-item v-if="form.point_status=='01' || form.point_status=='02'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" style="width: 370px;" />
           </el-form-item>
           <el-form-item v-if="form.point_status=='02'" label="库存数" prop="ivt_qty">
@@ -116,6 +116,16 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="是否满拖" prop="is_full">
+            <el-select v-model="form.is_full" filterable placeholder="请选择" style="width: 370px">
+              <el-option
+                v-for="item in dict.is_active"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -191,7 +201,7 @@ export default {
   name: 'OutKiln',
   components: { WorkDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
-  dicts: ['sch_area_type', 'sch_point_type', 'sch_point_status', 'sch_lock_type'],
+  dicts: ['sch_area_type', 'sch_point_type', 'sch_point_status', 'sch_lock_type', 'is_active'],
   cruds() {
     return CRUD({
       title: '出窑缓存库区',
@@ -233,6 +243,9 @@ export default {
         ],
         lock_type: [
           { required: true, message: '锁定类型不能为空', trigger: 'blur' }
+        ],
+        vehicle_code: [
+          { required: true, message: '载具编码不能为空', trigger: 'blur' }
         ]
       }}
   },