代码更新

mes/hd/nladmin-system/src/main/java/org/nl/wms/cacheline/position/service/impl/CachelinePositionServiceImpl.java

@@ -63,7 +63,7 @@ public class CachelinePositionServiceImpl implements CachelinePositionService {
     @Override
     public CachelinePositionDto findByCode(String  code) {
         WQLObject wo = WQLObject.getWQLObject("sch_cacheline_position");
-        JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0);
+        JSONObject json = wo.query("position_code ='" + code + "'").uniqueResult(0);
         if (ObjectUtil.isNotEmpty(json)){
              return json.toJavaObject( CachelinePositionDto.class);
         }
@@ -73,8 +73,6 @@ public class CachelinePositionServiceImpl implements CachelinePositionService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void create(CachelinePositionDto dto) {
-        dto.setPosition_code(IdUtil.getSnowflake(1, 1).nextIdStr());
-
         WQLObject wo = WQLObject.getWQLObject("sch_cacheline_position");
         JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto));
         wo.insert(json);
@@ -83,7 +81,7 @@ public class CachelinePositionServiceImpl implements CachelinePositionService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(CachelinePositionDto dto) {
-        CachelinePositionDto entity = this.findById(dto.getPosition_code());
+        CachelinePositionDto entity = this.findByCode(dto.getPosition_code());
         if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
 
         WQLObject wo = WQLObject.getWQLObject("sch_cacheline_position");

mes/qd/src/views/wms/cacheline/position/index.vue

@@ -5,46 +5,106 @@
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission" />
       <!--表单组件-->
-      <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
-        <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
+      <el-dialog
+        :close-on-click-modal="false"
+        :before-close="crud.cancelCU"
+        :visible.sync="crud.status.cu > 0"
+        :title="crud.status.title"
+        width="710px">
+        <el-form ref="form" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px">
+          <el-form-item label="生产区域" prop="product_area">
+            <el-select
+              v-model="form.product_area"
+              placeholder=""
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.product_area"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="缓存线位置编码" prop="position_code">
-            <el-input v-model="form.position_code" style="width: 370px;" />
+            <el-input v-model="form.position_code" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="缓存线位置名字" prop="position_name">
-            <el-input v-model="form.position_name" style="width: 370px;" />
+            <el-input v-model="form.position_name" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="位置顺序号" prop="positionOrder_no">
-            <el-input v-model="form.positionOrder_no" style="width: 370px;" />
+            <el-input v-model="form.positionOrder_no" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="缓存线编码" prop="cacheLine_code">
-            <el-input v-model="form.cacheLine_code" style="width: 370px;" />
+            <el-input v-model="form.cacheLine_code" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="缓存线层数" prop="layer_num">
-            <el-input v-model="form.layer_num" style="width: 370px;" />
+            <el-input v-model="form.layer_num" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="优先层顺序" prop="priority_layer_no">
-            <el-input v-model="form.priority_layer_no" style="width: 370px;" />
+            <el-input v-model="form.priority_layer_no" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="料箱展示顺序号" prop="order_no">
-            <el-input v-model="form.order_no" style="width: 370px;" />
+            <el-input v-model="form.order_no" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="载具编码">
-            <el-input v-model="form.vehicle_code" style="width: 370px;" />
-          </el-form-item>
-          <el-form-item label="生产区域" prop="product_area">
-            <el-input v-model="form.product_area" style="width: 370px;" />
+            <el-input v-model="form.vehicle_code" style="width: 200px;" />
           </el-form-item>
           <el-form-item label="是否空位" prop="is_empty">
-            <el-input v-model="form.is_empty" style="width: 370px;" />
+            <el-select
+              v-model="form.is_empty"
+              placeholder=""
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="是否展示" prop="is_show">
-            <el-input v-model="form.is_show" style="width: 370px;" />
+            <el-select
+              v-model="form.is_show"
+              placeholder=""
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="是否可用" prop="is_active">
-            <el-input v-model="form.is_active" style="width: 370px;" />
+            <el-select
+              v-model="form.is_active"
+              placeholder=""
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="是否删除" prop="is_delete">
-            <el-input v-model="form.is_delete" style="width: 370px;" />
+            <el-select
+              v-model="form.is_delete"
+              placeholder=""
+              style="width: 200px"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.id"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
@@ -85,7 +145,7 @@
 
 <script>
 import crudCachelinePosition from '@/api/wms/cacheline/position/cachelinePosition'
-import CRUD, {crud, form, header, presenter} from '@crud/crud'
+import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation.vue'
 import crudOperation from '@crud/CRUD.operation.vue'
 import udOperation from '@crud/UD.operation.vue'
@@ -100,18 +160,25 @@ const defaultForm = {
   priority_layer_no: null,
   order_no: null,
   vehicle_code: null,
-  product_area: null,
-  is_empty: null,
-  is_show: null,
-  is_active: null,
-  is_delete: null
+  product_area: 'A1',
+  is_empty: '1',
+  is_show: '1',
+  is_active: '1',
+  is_delete: '0'
 }
 export default {
   name: 'CachelinePosition',
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
+  dicts: ['product_area', 'IS_OR_NOT'],
   cruds() {
-    return CRUD({ title: '缓存线位置', url: 'api/cachelinePosition', idField: 'position_code', sort: 'position_code,desc', crudMethod: { ...crudCachelinePosition }})
+    return CRUD({
+      title: '缓存线位置',
+      url: 'api/cachelinePosition',
+      idField: 'position_code',
+      sort: 'position_code,desc',
+      crudMethod: { ...crudCachelinePosition }
+    })
   },
   data() {
     return {