代码更新

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

@@ -187,7 +187,7 @@ public class InbillServiceImpl {
                 JSONObject paramMesMst = new JSONObject();
                 paramMesMst.put("PackageBoxSN",box_row.getString("box_no"));
                 paramMesMst.put("User",box_row.getString("confirm_optname"));
-                new LmsToMesServiceImpl().childRollFGInboundComplete(paramMesMst);
+                // new LmsToMesServiceImpl().childRollFGInboundComplete(paramMesMst);
             }
         }
         //回传SAP

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHANGE.wql

@@ -101,15 +101,32 @@
 
 	 IF 输入.flag = "2"
         QUERY
-            SELECT
+            SELECT DISTINCT
-                dtl.*,
+            	dtl.mfg_order_name AS new_sale_order_name,
-                mb.material_code,
+            	dtl.customer_name AS new_customer_name,
-                mb.material_name
+            	dtl.customer_description AS new_customer_description,
+            	dtl.package_box_sn AS storagevehicle_code,
+            	sa.sect_name AS turnout_sect_name,
+            	sa.struct_code AS turnout_struct_code,
+            	mb.material_code,
+            	mb.material_name,
+            	dtl.seq_no,
+            	sub.sale_order_name,
+            	sub.customer_name,
+            	sub.customer_description,
+            	sub.net_weight AS qty,
+            	dtl.demand_date,
+            	dtl.UpdatedDateOfProduction AS date_of_FG_inbound,
+            	dtl.isRePrintPackageBoxLabel,
+            	dtl.isUnPackBox,
+            	dtl.pcsn
             FROM
-                st_ivt_structivtchangedtl dtl
+            	st_ivt_structivtchangedtl dtl
-            LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
+            	LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id
+            	LEFT JOIN st_ivt_structattr sa ON sa.storagevehicle_code = dtl.package_box_sn
+            	LEFT JOIN pdm_bi_subpackagerelation sub ON sub.package_box_sn = dtl.package_box_sn AND sub.container_name = dtl.pcsn
             WHERE
-                1 = 1
+            	1 = 1
             OPTION 输入.changeinv_id <> ""
                   dtl.changeinv_id = 输入.changeinv_id
             ENDOPTION

lms/nladmin-ui/src/views/wms/st/inStor/change/AddDialog.vue

@@ -157,17 +157,9 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column key="1" type="index" label="序号" width="50" align="center" />
-      <el-table-column
+      <el-table-column key="3" prop="material_code" label="物料编码" width="150" align="center" />
-        v-if="crud.status.add!==1"
+      <el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="200"/>
-        key="2"
+      <el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="150" show-overflow-tooltip />
-        prop="work_status"
-        label="状态"
-        align="center"
-        :formatter="bill_statusFormat"
-      />
-      <el-table-column key="3" show-overflow-tooltip prop="material_code" label="物料编码" width="120" align="center" />
-      <el-table-column key="4" prop="material_name" label="物料名称" align="center" min-width="120" show-overflow-tooltip />
-      <el-table-column key="5" prop="pcsn" label="批次号" align="center" min-width="100" show-overflow-tooltip />
       <el-table-column
         key="10"
         show-overflow-tooltip
@@ -211,25 +203,25 @@
           <span v-show="scope.row.edit">{{ scope.row.demand_date }}</span>
         </template>
       </el-table-column>
-      <el-table-column key="24" width="150" show-overflow-tooltip prop="date_of_FG_inbound" label="制作日期-新">
+      <el-table-column key="24" width="150" show-overflow-tooltip prop="date_of_fg_inbound" label="制作日期-新">
         <template scope="scope">
-        <el-input v-show="!scope.row.edit" v-model="scope.row.date_of_FG_inbound" class="input-with-select">
+        <el-input v-show="!scope.row.edit" v-model="scope.row.date_of_fg_inbound" class="input-with-select">
         </el-input>
-        <span v-show="scope.row.edit">{{ scope.row.date_of_FG_inbound }}</span>
+        <span v-show="scope.row.edit">{{ scope.row.date_of_fg_inbound }}</span>
         </template>
       </el-table-column>
-      <el-table-column key="22" width="150" show-overflow-tooltip prop="isRePrintPackageBoxLabel" label="更换外包装标签">
+      <el-table-column key="22" width="150" show-overflow-tooltip prop="isreprintpackageboxlabel" label="更换外包装标签">
         <template scope="scope">
-        <el-input v-show="!scope.row.edit" v-model="scope.row.isRePrintPackageBoxLabel" class="input-with-select">
+        <el-input v-show="!scope.row.edit" v-model="scope.row.isreprintpackageboxlabel" class="input-with-select">
         </el-input>
-        <span v-show="scope.row.edit">{{ scope.row.isRePrintPackageBoxLabel }}</span>
+        <span v-show="scope.row.edit">{{ scope.row.isreprintpackageboxlabel }}</span>
         </template>
       </el-table-column>
-      <el-table-column key="23" width="150" show-overflow-tooltip prop="isUnPackBox" label="更换子卷标签">
+      <el-table-column key="23" width="150" show-overflow-tooltip prop="isunpackbox" label="更换子卷标签">
         <template scope="scope">
-        <el-input v-show="!scope.row.edit" v-model="scope.row.isUnPackBox" class="input-with-select">
+        <el-input v-show="!scope.row.edit" v-model="scope.row.isunpackbox" class="input-with-select">
         </el-input>
-        <span v-show="scope.row.edit">{{ scope.row.isUnPackBox }}</span>
+        <span v-show="scope.row.edit">{{ scope.row.isunpackbox }}</span>
         </template>
       </el-table-column>
       <el-table-column v-if="crud.status.cu > 0" key="25" align="center" label="操作" width="160" fixed="right">
@@ -347,7 +339,7 @@ export default {
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
-          row.edit = true
+          this.$set(row, 'edit', true)
           this.form.tableData.splice(i, 1, row)
         }
       })
@@ -359,7 +351,7 @@ export default {
         // 将明细变成不可编辑
         for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
-          row.edit = true
+          this.$set(row, 'edit', true)
           this.form.tableData.splice(i, 1, row)
         }
       })

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

@@ -213,7 +213,7 @@ export default {
       mater_btn: false,
       materType: '',
       storlist: [],
-      billtypelist: [{ 'code': '000101', 'name': '生产入库' }],
+      billtypelist: [],
       rules: {
         stor_id: [
           { required: true, message: '仓库不能为空', trigger: 'blur' }
@@ -237,7 +237,7 @@ export default {
   methods: {
     open() {
       // 查询原材料库的仓库
-      crudStorattr.getStor({ 'is_productstore': '1' }).then(res => {
+      crudStorattr.getStor({ 'is_virtualstore': '1' }).then(res => {
         this.storlist = res.content
       })
     },

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

@@ -289,7 +289,7 @@ export default {
   methods: {
     open() {
       debugger
-      crudSectattr.getSect({ 'is_productstore': '1' }).then(res => {
+      crudSectattr.getSect({ 'is_virtualstore': '1' }).then(res => {
         this.sects = res.content
       })
       const area_type = '1585164789083148288'
@@ -499,6 +499,10 @@ export default {
       }
       // 如果勾选了，直接跳后台
       if (this.form.checked) {
+        if (!this.sect_id) {
+          this.crud.notify('请先选择区域！', CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        }
         this.form.sect_id = this.sect_id
         this.form.stor_id = this.stor_id
         this.form.is_pc = '1'