修改

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java

@@ -574,9 +574,9 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
         HashMap<String, String> map = rows.get(0);
 
         //判断该载具是否已经分配货位或者起点
-        JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("storagevehicle_code = '" + map.get("storagevehicle_code") + "' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0);
+        JSONArray now_dis_rows = WQLObject.getWQLObject("st_ivt_iostorinvdis").query("box_no = '" + map.get("box_no") + "' AND work_status < '99' AND (struct_id <> '' AND struct_id is not null)").getResultJSONArray(0);
         if (now_dis_rows.size() > 0) {
-            throw new BadRequestException("该载具已经分配过货位，无法继续分配！");
+            throw new BadRequestException("该木箱已经分配过货位，无法继续分配！");
         }
 
         String point_code = map.get("point_code");

lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql

@@ -24,6 +24,7 @@
     输入.bill_type   					TYPEAS s_string
     输入.container_name   			    TYPEAS s_string
     输入.package_box_sn   			    TYPEAS s_string
+    输入.iostorinv_id   			        TYPEAS s_string
 
 
 [临时表]
@@ -153,7 +154,7 @@
                 SELECT
                 	dis.*,
                     mb.material_code,
-                    mb.material_name,
+                    mb.material_name
                 FROM
                 	st_ivt_iostorinvdis dis
                 INNER JOIN md_me_materialbase mb ON mb.material_id = dis.material_id

lms/nladmin-ui/src/views/wms/st/inbill/DivDialog.vue

@@ -199,8 +199,7 @@
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
-        <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="木箱号" align="center"/>
+        <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
-        <el-table-column show-overflow-tooltip prop="storage_qty" :formatter="crud.formatNum3" label="重量" align="center"/>
         <el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
         <el-table-column align="center" label="操作" width="190" fixed="right">
@@ -308,9 +307,10 @@ export default {
       if (this.billType === '000401') {
         area_type = '\'21\',\'26\',\'29\',\'31\',\'35\',\'32\',\'33\',\'34\''
       }
-      crudPoint.getPoint({ 'area_type': area_type }).then(res => {
+      /* crudPoint.getPoint({ 'area_type': area_type }).then(res => {
         this.pointlist = res
-      })
+      })*/
+      this.pointlist = [{ 'point_code': 'RK01', 'point_name': '一楼入库点' }]
     },
     toDelete(data) {
       data.pop = true
@@ -491,9 +491,9 @@ export default {
         this.crud.notify('请选择入库点', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      const flag = this.form.tableMater.some(mater => !mater.iostorinvdis_id)
+      debugger
-      if (flag) {
+      if (this.form.tableMater.length === 0) {
-        this.crud.notify('请先进行组盘！', CRUD.NOTIFICATION_TYPE.INFO)
+        this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
       crudRawAssist.divPoint(this.form).then(res => {
@@ -507,13 +507,8 @@ export default {
       })
     },
     divStruct() {
-      if (this.form.tableMater.length <= 0) {
+      if (this.form.tableMater.length === 0) {
-        this.crud.notify('不存在载具明细！', CRUD.NOTIFICATION_TYPE.INFO)
+        this.crud.notify('请先选择一条明细！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      const flag = this.form.tableMater.some(mater => !mater.iostorinvdis_id)
-      if (flag) {
-        this.crud.notify('请先进行组盘！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
       // 如果勾选了，直接跳后台