Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

lms/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.service.impl.ParamServiceImpl;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.http.HttpStatus;
@@ -44,9 +45,9 @@ public class AcsUtil {
             result.put("data", new JSONObject());
         }
         //acs抛异常这里
-        /*if (result.getString("status").equals(String.valueOf(HttpStatus.BAD_REQUEST.value())))
+        if (!StrUtil.equals(result.getString("status"), "200")) {
-            throw new BadRequestException(result.getString("message"));*/
+            throw new BadRequestException("下发失败："+result.getString("message"));
-
+        }
         return result;
     }
 }

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

@@ -250,7 +250,7 @@
       </el-table-column>
     </el-table>
 
-    <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" :open-param="materType" @tableChanged="tableChanged5" />
+    <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged5" />
     <MaterDialog :dialog-show.sync="materShow" :mater-opt-code.sync="materType" @setMaterValue="setMaterValue" />
   </el-dialog>
 </template>
@@ -336,7 +336,6 @@ export default {
       this.$emit('AddChanged')
     },
     [CRUD.HOOK.beforeSubmit]() {
-      debugger
       if (this.form.tableData.length === 0) {
         this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
         return false
@@ -398,7 +397,7 @@ export default {
              this.nowrow = row
            })*/
     },
-    async queryDtl(index, row) {
+    queryDtl(index, row) {
       if (this.form.bill_type === '') {
         this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
         return
@@ -415,7 +414,6 @@ export default {
     },
     tableChanged(rows) {
       rows.forEach((item) => {
-        debugger
         if (this.form.tableData.length !== 0) {
           this.flagnow = false
           for (let i = 0; i < this.form.tableData.length; i++) {

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

@@ -53,13 +53,13 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="instorage_time" label="入库日期" :min-width="flexWidth('instorage_time',crud.data,'入库日期')" />
+      <el-table-column prop="instorage_time" label="入库日期" show-overflow-tooltip width="145px" />
-      <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
+      <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip width="140px" />
-      <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+      <el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="150px" />
-      <el-table-column prop="struct_name" label="仓位" :min-width="flexWidth('struct_name',crud.data,'仓位')" />
+      <el-table-column prop="struct_name" label="仓位" show-overflow-tooltip width="150px" />
-      <el-table-column prop="box_no" label="箱号" :min-width="flexWidth('box_no',crud.data,'箱号')" />
+      <el-table-column prop="box_no" label="箱号" show-overflow-tooltip width="250px" />
-      <el-table-column prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')" />
+      <el-table-column prop="pcsn" label="子卷号" show-overflow-tooltip width="150px" />
-      <el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')" />
+      <el-table-column prop="sap_pcsn" label="sap批次" show-overflow-tooltip width="120px" />
       <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" />
       <el-table-column show-overflow-tooltip prop="qty_unit_name" label="重量单位" />
     </el-table>
@@ -103,9 +103,6 @@ export default {
       type: Boolean,
       default: false
     },
-    openParam: {
-      type: String
-    },
     storId: {
       type: String
     }
@@ -124,11 +121,6 @@ export default {
         this.dialogVisible = newValue
       }
     },
-    openParam: {
-      handler(newValue, oldValue) {
-        this.opendtlParam = newValue
-      }
-    }
   },
   methods: {
     [CRUD.HOOK.beforeRefresh]() {
@@ -152,6 +144,7 @@ export default {
       this.crud.query.mater_type = this.opendtlParam
     },
     submit() {
+      debugger
       this.rows = this.$refs.multipleTable.selection
       if (this.rows.length <= 0) {
         this.$message('请先勾选物料')