feat: 出库查询添加收货地址及木箱号查询

- 出库单查询及导出增加仓库、库区和收货地址字段
- 货位查询增加木箱号查询条件
- 修复MES接口异常时缺少return的bug
- 移除出库明细页面的debugger并修正日志错别字

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructattrServiceImpl.java

@@ -80,7 +80,7 @@ public class StructattrServiceImpl implements StructattrService {
         map.put("layer_num", (String) whereJson.get("layer_num"));
         map.put("is_used", (String) whereJson.get("is_used"));
         map.put("is_have", (String) whereJson.get("is_have"));
-
+        map.put("storagevehicle_code",(String) whereJson.get("storagevehicleCode"));
       /*  // 如果是二期仓库则将层数删除
         if (ObjectUtil.isNotEmpty(whereJson.get("stor_id"))) {
             if ( whereJson.get("stor_id").equals(IOSEnum.STOR_ID.code("二期"))) {

lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCT_ATTR.wql

@@ -78,6 +78,9 @@
                     OPTION 输入.layer_num <> ""
                            struct.layer_num = 输入.layer_num
                     ENDOPTION
+                    OPTION 输入.storagevehicle_code <> ""
+                           struct.storagevehicle_code = 输入.storagevehicle_code
+                    ENDOPTION
                     OPTION 输入.is_used <> ""
                            struct.is_used = 输入.is_used
                     ENDOPTION

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java

@@ -1014,7 +1014,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
             throw new BadRequestException("MES提示错误：" + e.getMessage());
         }
         // 记录成功日志
-        OutboundApiLogger.logSuccess("mes", "/CamstarApi/momGetPackingInfo", "根据木想号母卷获取包装信息",
+        OutboundApiLogger.logSuccess("mes", "/CamstarApi/momGetPackingInfo", "根据木箱号母卷获取包装信息",
                 url, "POST", JSONUtil.toJsonStr(param), result.toString(), 200,
                 System.currentTimeMillis() - startTime);
         return result;

lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java

@@ -729,6 +729,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
             result.put("RTMSG", "操作失败!" + e.getMessage());
             result.put("RTOAL", 0);
             result.put("RTDAT", null);
+            return result;
         }
         result.put("RTYPE", "S");
         result.put("RTMSG", "操作成功!");

lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java

@@ -444,6 +444,8 @@ public class InBillQueryServiceImpl implements InBillQueryService {
             for (int i = 0; i < resultJSONArray.size(); i++) {
                 JSONObject json = resultJSONArray.getJSONObject(i);
                 Map<String, Object> mp = new LinkedHashMap<>();
+                mp.put("仓库", json.getString("stor_name"));
+                mp.put("库区", json.getString("sect_name"));
                 mp.put("日期", (json.getString("confirm_time_class").substring(0, 10)).replace("-", "/"));
                 mp.put("班次", json.getString("classes"));
                 if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {
@@ -522,6 +524,8 @@ public class InBillQueryServiceImpl implements InBillQueryService {
             for (int i = 0; i < resultJSONArray.size(); i++) {
                 JSONObject json = resultJSONArray.getJSONObject(i);
                 Map<String, Object> mp = new LinkedHashMap<>();
+                mp.put("仓库", json.getString("stor_name"));
+                mp.put("库区", json.getString("sect_name"));
                 mp.put("序号", String.valueOf(i + 1));
                 mp.put("日期", (json.getString("confirm_time_class").substring(0, 10)).replace("-", "/"));
                 mp.put("班次", json.getString("classes"));

lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java

@@ -359,13 +359,13 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
                         .orElse(null);
 
                 mp.put("仓库", json.getString("stor_name"));
-                if (ObjectUtil.isNotEmpty(bill_type) && "1004".equals(bill_type)) {
-                    mp.put("移入仓库", json.getString("in_stor_name"));
-                }
                 mp.put("库区", json.getString("sect_name"));
-                mp.put("生产区域", json.getString("pcsn").substring(0, 2));
                 String bill_type1 = json.getString("bill_type");
-
+                if(ObjectUtil.isNotEmpty(bill_type1) && "1004".equalsIgnoreCase(bill_type1)){
+                    mp.put("收货地址（目的仓库）", json.getString("in_stor_name"));
+                }else{
+                    mp.put("收货地址（目的仓库）", json.getString("receiptaddress"));
+                }
                 String bill_name = "";
                 switch (bill_type1) {
                     case "1001" :

lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql

@@ -286,7 +286,8 @@
                 case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type,
                 case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then plan.FRP_material end AS paper_code,
                 case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then plan.FRP_description end AS paper_name,
-                stor.stor_name AS in_stor_name
+                stor.stor_name AS in_stor_name,
+                mst.receiptaddress
             FROM
                 (
                 SELECT
@@ -413,7 +414,8 @@
                     case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type,
                     case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then plan.FRP_material end AS paper_code,
                     case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then plan.FRP_description end AS paper_name,
-                    stor.stor_name AS in_stor_name
+                    stor.stor_name AS in_stor_name,
+                    mst.receiptaddress
                 FROM
                     (
                     SELECT

lms/nladmin-ui/src/views/wms/basedata/st/struct/index.vue

@@ -69,7 +69,14 @@
               />
             </el-select>
           </el-form-item>
-
+          <el-form-item label="木箱号">
+            <el-input
+              v-model="query.storagevehicleCode"
+              clearable
+              size="mini"
+              placeholder="请输入木箱编码"
+            />
+          </el-form-item>
           <el-form-item label="模糊搜索">
             <el-input
               v-model="query.search"

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

@@ -541,7 +541,6 @@ export default {
     },
     divOpen() {
       checkoutbill.getOutBillDtl({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
-        debugger
         this.openParam = res
         this.storId = this.currentRow.stor_id
         this.divShow = true

lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue

@@ -111,8 +111,12 @@
         style="width: 100%;"
       >
         <el-table-column show-overflow-tooltip prop="stor_name" label="仓库" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
-        <el-table-column v-if="query.bill_type === '1004'" show-overflow-tooltip prop="in_stor_name" label="移入仓库" :min-width="flexWidth('in_stor_name',crud.data,'仓库')" />
         <el-table-column show-overflow-tooltip prop="sect_name" label="库区" :min-width="flexWidth('sect_name',crud.data,'库区')" />
+        <el-table-column show-overflow-tooltip prop="in_stor_name" label="收货地址（目的仓库）" :min-width="flexWidth('in_stor_name',crud.data,'收货地址（目的仓库）')" >
+          <template slot-scope="scope">
+            {{ scope.row.bill_type === '1004' ? scope.row.in_stor_name : scope.row.receiptaddress }}
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip prop="bill_type" :formatter="bill_typeFormat" label="业务类型" :min-width="flexWidth('bill_type',crud.data,'业务类型')" />
         <el-table-column show-overflow-tooltip prop="vbeln" label="交货单号" :min-width="flexWidth('vbeln',crud.data,'交货单号')" />
         <el-table-column show-overflow-tooltip prop="cust_name" label="物流公司" :min-width="flexWidth('cust_name',crud.data,'物流公司')" />