代码合并

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -2522,6 +2522,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
         JSONArray allRowArr = WQL.getWO("ST_OUTIVT04")
                 .addParam("flag", "1")
                 .addParam("iostorinvdtl_id", iostorinvdtl_id)
+                .addParam("iostorinv_id", iostorinv_id)
                 .process()
                 .getResultJSONArray(0);
 

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT04.wql

@@ -14,6 +14,7 @@
 	##			表字段对应输入参数
 	#################################################
 	输入.flag					                 TYPEAS s_string
+	输入.iostorinv_id					         TYPEAS s_string
 	输入.iostorinvdtl_id					         TYPEAS s_string
 	输入.block_num					             TYPEAS s_string
 	输入.row_num					                 TYPEAS s_string
@@ -58,6 +59,10 @@
                 dis.iostorinvdtl_id = 输入.iostorinvdtl_id
            ENDOPTION
 
+           OPTION 输入.iostorinv_id <> ""
+                dis.iostorinv_id = 输入.iostorinv_id
+           ENDOPTION
+
            group by attr.block_num,attr.row_num
 
            order by attr.row_num ASC

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

@@ -92,6 +92,17 @@
         >
           手工分配
         </el-button>
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="warning"
+          :loading="loadingSetAllPoint"
+          icon="el-icon-check"
+          size="mini"
+          @click="allSetPointAllDtl"
+        >
+          一键设置
+        </el-button>
       </span>
     </div>
     <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -116,7 +127,7 @@
         <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="unassign_qty" label="未分配重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column prop="quality_scode" label="品质类型" align="center" width="110px" :formatter="quality_scodeFormat" />
-<!--        <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
+        <!--        <el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />-->
         <el-table-column show-overflow-tooltip prop="vbeln" label="交货单" align="center" />
         <el-table-column show-overflow-tooltip prop="source_bill_code" label="源单编号" align="center" />
         <el-table-column show-overflow-tooltip prop="width" label="幅宽" align="center" width="100" />
@@ -165,7 +176,7 @@
       <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
-    <!--    <el-button
+        <!--    <el-button
           slot="left"
           class="filter-item"
           type="warning"
@@ -231,11 +242,11 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column prop="material_code" label="物料编码" width="150px" :min-width="flexWidth('material_code',crud.data,'物料编码')"/>
+        <el-table-column prop="material_code" label="物料编码" width="150px" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="material_name" label="物料名称" width="150px" :min-width="flexWidth('material_name',crud.data,'物料名称')"/>
+        <el-table-column prop="material_name" label="物料名称" width="150px" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
-        <el-table-column prop="box_no" label="木箱号" width="250px" :min-width="flexWidth('box_no',crud.data,'木箱号')"/>
+        <el-table-column prop="box_no" label="木箱号" width="250px" :min-width="flexWidth('box_no',crud.data,'木箱号')" />
-        <el-table-column prop="pcsn" label="子卷批次号" width="150px" :min-width="flexWidth('pcsn',crud.data,'子卷批次号')"/>
+        <el-table-column prop="pcsn" label="子卷批次号" width="150px" :min-width="flexWidth('pcsn',crud.data,'子卷批次号')" />
-        <el-table-column prop="sap_pcsn" label="sap批次号" width="150px" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次号')"/>
+        <el-table-column prop="sap_pcsn" label="sap批次号" width="150px" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次号')" />
         <el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_code" width="150px" label="仓位编码" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_name" width="150px" label="仓位名称" align="center" />
@@ -289,6 +300,7 @@ export default {
       loadingAlldiv: false,
       loadingAutodiv: false,
       loadingSetPoint: false,
+      loadingSetAllPoint: false,
       areatype: '',
       typedisable: false,
       pointshow: false,
@@ -610,6 +622,22 @@ export default {
         this.loadingSetAllPoint = false
       })
     },
+    allSetPointAllDtl() {
+      if (this.form2.point_code === '') {
+        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.loadingSetAllPoint = true
+      this.currentRow.point_code = this.form2.point_code
+      this.currentRow.iostorinv_id = this.mstrow.iostorinv_id
+      checkoutbill.allSetPoint(this.currentRow).then(res => {
+        this.queryTableDdis(this.currentRow.iostorinvdtl_id)
+        this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
+        this.loadingSetAllPoint = false
+      }).catch(() => {
+        this.loadingSetAllPoint = false
+      })
+    },
     queryTableDtl() {
       checkoutbill.getOutBillDtl({ 'iostorinv_id': this.mstrow.iostorinv_id }).then(res => {
         this.tableDtl = res