diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java index f7eb7e434..bfe0da3c6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/sap/service/impl/SapToLmsServiceImpl.java @@ -99,6 +99,7 @@ public class SapToLmsServiceImpl implements SapToLmsService { jsonMst.put("receiver", json.getString("CONSIGNEE")); // 收货人 jsonMst.put("receiptphone", json.getString("TEL_NUMBER")); // 联系电话 jsonMst.put("contractno", json.getString("BSTNK")); // 合同号 + jsonMst.put("cust_code", json.getString("KUNNR")); // 客户 // 明细 JSONObject jsonMater = materTab.query("material_code = '" + json.getString("MATNR") + "'").uniqueResult(0); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java index 1ced396ff..2437ea1a2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/VirtualOutServiceImpl.java @@ -93,7 +93,7 @@ public class VirtualOutServiceImpl implements VirtualOutService { String box_no = whereJson.getString("box_no"); // 箱号 - JSONArray disArr = disTab.query("box_no = '" + box_no + "' and work_status <> '99'").getResultJSONArray(0); + JSONArray disArr = WQL.getWO("PDA_ST_01").addParam("flag", "7").addParam("box_no", box_no).process().getResultJSONArray(0); for (int i = 0; i < disArr.size(); i++) { JSONObject jsonDis = disArr.getJSONObject(i); // 更新状态为完成 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql index 760e17ca3..3ef9abb58 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_ST_01.wql @@ -174,4 +174,24 @@ pdm_bi_printinfo ENDSELECT ENDQUERY + ENDIF + + IF 输入.flag = "7" + QUERY + SELECT + dis.* + FROM + ST_IVT_IOStorInvDis dis + LEFT JOIN st_ivt_iostorinv mst ON dis.iostorinv_id = mst.iostorinv_id + WHERE + mst.is_delete = '0' + AND mst.io_type = '1' + AND dis.work_status <> '99' + + OPTION 输入.box_no <> "" + dis.box_no = 输入.box_no + ENDOPTION + + ENDSELECT + ENDQUERY ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql index 4795b5bc4..a65b0b3ec 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/wql/PDA_VIRTUALOUT.wql @@ -66,6 +66,7 @@ WHERE dis.sect_id = '1586913215886004224' AND mst.is_delete = '0' + AND mst.io_type = '1' AND mst.bill_status <> '99' OPTION 输入.box_no <> "" @@ -117,6 +118,7 @@ WHERE dis.sect_id = '1586913215886004224' AND mst.is_delete = '0' + AND mst.io_type = '1' AND dis.work_status <> '99' OPTION 输入.box_no <> "" diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue index 69d3350a1..9b75a84e0 100644 --- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue +++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue @@ -550,8 +550,12 @@ export default { return strStyle + arr.join('') }, printExcel(jo) { + if (jo.shd_dtl_num === '') { + return this.crud.notify('客户为空!', CRUD.NOTIFICATION_TYPE.INFO) + } checkoutbill.getDisNum({ 'iostorinv_id': jo.iostorinv_id }).then(res => { const j = Math.ceil(res.num / jo.shd_dtl_num) + debugger for (let i = 0; i < j; i++) { download('/api/checkoutbill/downloadExcel', { 'iostorinv_id': jo.iostorinv_id, 'j': i, 'pageNum': j }).then(result => { downloadFile(result, '发货单', 'xlsx')