代码更新

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java

@@ -324,12 +324,12 @@ public class PointServiceImpl implements PointService {
             structMap.put("point_id", IdUtil.getSnowflake(1,1).nextId());
             structMap.put("point_code", json.getString("struct_code"));
             structMap.put("point_name", json.getString("struct_name"));
-            structMap.put("region_id", "");
+            structMap.put("region_id", json.get("sect_id"));
-            structMap.put("region_code", "");
+            structMap.put("region_code", json.getString("sect_code"));
-            structMap.put("region_name", "");
+            structMap.put("region_name", json.getString("sect_name"));
-            structMap.put("point_type", "01");
+            structMap.put("point_type", "2");
-            structMap.put("point_status", "00");
+            structMap.put("point_status", "1");
-            structMap.put("lock_type", "1");
+            structMap.put("lock_type", json.getString("lock_type"));
             structMap.put("block_num", json.getIntValue("block_num"));
             structMap.put("row_num", json.getIntValue("row_num"));
             structMap.put("col_num", json.getIntValue("col_num"));

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/wql/QSCH_BASE_POINT.wql

@@ -91,7 +91,7 @@
             FROM
                 ST_IVT_StructAttr struct
             left join
-                SCH_BASE_Region region on struct.region_id = region.region_id
+                SCH_BASE_Region region on struct.sect_id = region.region_id
             WHERE
                 struct.is_delete = '0'
     		ENDSELECT

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -69,7 +69,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
+         <!-- <el-form-item v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')" label="块">
             <el-input
               v-model="query.block_num"
               clearable
@@ -104,16 +104,24 @@
               placeholder="层"
               @keyup.enter.native="crud.toQuery"
             />
-          </el-form-item>
+          </el-form-item>-->
+          
           <el-form-item label="锁定类型">
-            <el-switch
+            <el-select
               v-model="query.lock_type"
-              active-value="2"
+              clearable
-              inactive-value="1"
+              filterable
-              active-color="#409EFF"
+              size="mini"
-              inactive-color="#C0CCDA"
+              placeholder="锁定类型"
+              class="filter-item"
               @change="hand"
+            >
+              <el-option
+                v-for="item in dict.d_lock_type"
+                :label="item.label"
+                :value="item.value"
               />
+            </el-select>
           </el-form-item>
 
           <el-form-item label="是否启用">
@@ -234,7 +242,7 @@
               clearable
             >
               <el-option
-                v-for="item in pointStatusList"
+                v-for="item in pointStatusDialogList"
                 :label="item.label"
                 :value="item.value"
               />
@@ -255,16 +263,16 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="点位类型" prop="device_point_type">
+          <el-form-item label="点位类型" prop="point_type">
             <el-select
               v-model="form.point_type"
               size="mini"
-              placeholder="设备点位类型"
+              placeholder="点位类型"
               class="filter-item"
               style="width: 370px;"
             >
               <el-option
-                v-for="item in pointTypesList"
+                v-for="item in pointTypesDialogList"
                 :label="item.label"
                 :value="item.value"
               />
@@ -299,13 +307,14 @@
         <el-table-column prop="point_type_name" label="点位类型" />
         <el-table-column prop="point_status_name" label="点位状态" />
         <el-table-column prop="lock_type_name" label="锁定类型" />
-        <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
+   <!--     <el-table-column prop="vehicle_type" label="载具类型" min-width="120">
           <template slot-scope="scope">
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column prop="vehicle_code" label="载具编码" />
         <el-table-column prop="vehicle_qty" label="载具数量" />
+        <el-table-column prop="product_area" label="生产区域" />
         <el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
         <el-table-column prop="is_used" label="是否启用">
           <template slot-scope="scope">
@@ -336,7 +345,7 @@
 </template>
 
 <script>
-import crudRegion from '@/views/wms/sch/region'
+import crudRegion from '@/views/wms/sch/region/region'
 import crudPoint, { changeActive } from '@/views/wms/sch/point/point'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -388,6 +397,9 @@ export default {
         point_type: [
           { required: true, message: '点位类型不能为空', trigger: 'blur' }
         ],
+        point_status: [
+          { required: true, message: '点位状态不能为空', trigger: 'blur' }
+        ],
         region_id: [
           { required: true, message: '区域类型不能为空', trigger: 'blur' }
         ],
@@ -439,6 +451,7 @@ export default {
       })
     },
     getPointStatusAndTypeList(id, flag) {
+      debugger
       if (id) {
         this.getPointStatusList(id, flag)
         this.getPointTypeList(id, flag)
@@ -446,6 +459,7 @@ export default {
       if (flag === 1) { this.crud.toQuery() }
     },
     getPointStatusList(id, flag) {
+      debugger
       crudRegion.getPointStatusSelectById(id).then(res => {
         if (flag === 1) {
           this.pointStatusList = res
@@ -456,7 +470,11 @@ export default {
     },
     getPointTypeList(id, flag) {
       crudRegion.getPointTypeSelectById(id).then(res => {
-        if (flag === 1) { this.pointTypesList = res } else { this.pointTypesDialogList = res }
+        if (flag === 1) {
+          this.pointTypesList = res
+        } else {
+          this.pointTypesDialogList = res
+        }
       })
     },
     changeUsed(data, flag) { // 更改启用状态

lms/nladmin-ui/src/views/wms/sch/region/index.vue

@@ -81,7 +81,7 @@
 </template>
 
 <script>
-import crudRegion, { changeActive } from '@/views/wms/sch/region'
+import crudRegion, { changeActive } from '@/views/wms/sch/region/region'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'