From 0fdd2c6aa08cb87cdc1f3e8d33c6e2f8358c478e Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 13 Jul 2023 14:38:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InBillQueryServiceImpl.java | 20 +- .../nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql | 244 +++++++++++++++++- .../src/views/wms/stat/inbillquery/index.vue | 27 +- 3 files changed, 272 insertions(+), 19 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 7fc5816d1..10089ebcc 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -3,6 +3,7 @@ package org.nl.wms.stat.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -133,9 +134,9 @@ public class InBillQueryServiceImpl implements InBillQueryService { JSONObject mapParam = new JSONObject(); if ("0".equals(is_all)) { - mapParam.put("flag", "1"); + mapParam.put("flag", "3"); } else { - mapParam.put("flag", "2"); + mapParam.put("flag", "4"); } mapParam.put("stor_id", stor_id); mapParam.put("bill_type", bill_type); @@ -164,7 +165,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { for (int i = 0; i < resultJSONArray.size(); i++) { JSONObject json = resultJSONArray.getJSONObject(i); Map mp = new LinkedHashMap<>(); - mp.put("日期", (json.getString("confirm_time").substring(0,10)).replace("-","/")); + mp.put("日期", (json.getString("confirm_time_class").substring(0,10)).replace("-","/")); mp.put("班次", json.getString("classes")); mp.put("客户代码", json.getString("sale_order_name")); mp.put("规格", json.getString("thickness_request")); @@ -179,17 +180,17 @@ public class InBillQueryServiceImpl implements InBillQueryService { }else { mp.put("木箱规格/尺寸", ""); } - mp.put("毛重合计", json.getString("box_weight")); - mp.put("净重（KG）", json.getString("net_weight")); + mp.put("毛重合计", NumberUtil.round(json.getString("box_weight"), 1)); + mp.put("净重（KG）", NumberUtil.round(json.getString("net_weight"), 1)); mp.put("卷数", json.getString("quanlity_in_box")); mp.put("品级", "A"); mp.put("小卷号", json.getString("pcsn")); mp.put("箱号", json.getString("box_no")); mp.put("母卷号", json.getString("parent_container_name")); - mp.put("基重（g/m³）（面密度）", json.getString("mass_per_unit_area")); + mp.put("基重（g/m³）（面密度）", NumberUtil.round(json.getString("mass_per_unit_area"), 2)); mp.put("居中度（mm）", "±1"); mp.put("塌边（mm）", "≤10"); - mp.put("米数（长度）", json.getString("length")); + mp.put("米数（长度）", NumberUtil.round(json.getString("length"), 1)); mp.put("生产日期", json.getString("date_of_production").replace("-","/")); mp.put("入库日期", json.getString("confirm_time").substring(0,10).replace("-","/")); list.add(mp); @@ -198,13 +199,16 @@ public class InBillQueryServiceImpl implements InBillQueryService { for (int i = 0; i < resultJSONArray.size(); i++) { JSONObject json = resultJSONArray.getJSONObject(i); Map mp = new LinkedHashMap<>(); + mp.put("序号", String.valueOf(i+1)); + mp.put("日期", (json.getString("confirm_time_class").substring(0,10)).replace("-","/")); + mp.put("班次", json.getString("classes")); mp.put("客户编码", json.getString("customer_name")); mp.put("客户订单号", json.getString("sale_order_name")); mp.put("生产日期", json.getString("date_of_production").replace("-","/")); mp.put("箱号", json.getString("box_no")); mp.put("生产批号", (json.getString("confirm_time").substring(0,10)).replace("-","").trim()); mp.put("规格", json.getString("specification")); - mp.put("净重", json.getString("net_weight")); + mp.put("净重", NumberUtil.round(json.getString("net_weight"), 1)); mp.put("等级", "A"); mp.put("备注", ""); list.add(mp); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql index d95c09dd0..cd82571bd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql @@ -85,7 +85,16 @@ DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' OR DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' - )) then '晚班' end) AS classes + )) then '晚班' end) AS classes, + CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size, + CASE + + WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >= '08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + THEN mst.confirm_time + WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >= '00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + THEN DATE_SUB(mst.confirm_time,INTERVAL 1 day) + END AS confirm_time_class + FROM st_ivt_iostorinvdis dis LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id @@ -128,7 +137,7 @@ ENDOPTION OPTION 输入.with <> "" - CONCAT(sub.width,'*',sub.thickness_request) = 输入.with + CONCAT( sub.thickness_request,'*',sub.width) = 输入.with ENDOPTION OPTION 输入.classes = "1" @@ -169,7 +178,21 @@ SUM(sub.net_weight) AS net_weight, MAX(mst.input_time) AS input_time, MAX(mst.confirm_time) AS confirm_time, - CONCAT_WS('',MAX(sub.thickness_request),'*',MAX(sub.width)) AS specification + CONCAT_WS('',MAX(sub.thickness_request),'*',MAX(sub.width)) AS specification, + CONCAT( MAX(sub.box_length),'*',MAX(sub.box_width),'*',MAX(sub.box_high)) AS box_size, + (case when DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '19:59:59' then '白班' + when (( + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + OR + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + )) then '晚班' end) AS classes, + CASE + WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >= '08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + THEN mst.confirm_time + WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >= '00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + THEN DATE_SUB(mst.confirm_time,INTERVAL 1 day) + END AS confirm_time_class + FROM st_ivt_iostorinvdis dis LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id @@ -210,7 +233,7 @@ ENDOPTION OPTION 输入.with <> "" - CONCAT(sub.width,'*',sub.thickness_request) = 输入.with + CONCAT( sub.thickness_request,'*',sub.width) = 输入.with ENDOPTION OPTION 输入.classes = "1" @@ -227,6 +250,219 @@ GROUP BY mst.iostorinv_id, dis.box_no + + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "3" + PAGEQUERY + SELECT + mst.stor_name, + dis.sect_name, + dis.struct_code, + dis.struct_name, + mst.bill_type, + dis.box_no, + mater.material_code, + mater.material_name, + mb.material_name AS box_name, + dis.pcsn, + sub.sap_pcsn, + sub.net_weight, + dis.qty_unit_name, + sub.customer_name, + sub.quanlity_in_box, + sub.customer_description, + sub.sale_order_name, + mst.input_time, + mst.confirm_time, + sub.date_of_production, + mst.input_optname, + sub.width, + sub.thickness, + sub.box_weight, + sub.length, + sub.thickness_request, + sub.width_standard, + sub.mass_per_unit_area, + (case when plan.parent_container_name <> '' then plan.parent_container_name else plan.restruct_container_name end) AS parent_container_name, + mst.remark, + (case when DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '19:59:59' then '白班' + when (( + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + OR + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + )) then '晚班' end) AS classes, + CONCAT( sub.box_length,'*',sub.box_width,'*',sub.box_high) AS box_size, + CASE + + WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >= '08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + THEN mst.confirm_time + WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >= '00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + THEN DATE_SUB(mst.confirm_time,INTERVAL 1 day) + END AS confirm_time_class + + FROM + st_ivt_iostorinvdis dis + LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id + LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no + LEFT JOIN pdm_bi_slittingproductionplan plan ON plan.container_name = sub.container_name + LEFT JOIN md_me_materialbase mb ON mb.material_code = sub.box_type + WHERE + mst.io_type = '0' + AND mst.is_delete = '0' + AND mst.bill_status = '99' + + OPTION 输入.stor_id <> "" + mst.stor_id = 输入.stor_id + ENDOPTION + + OPTION 输入.is_virtual = "0" + sect.sect_type_attr <> '09' + ENDOPTION + OPTION 输入.is_virtual = "1" + sect.sect_type_attr = '09' + ENDOPTION + OPTION 输入.areas <> "" + LEFT(sub.container_name,2) IN 输入.areas + ENDOPTION + OPTION 输入.thickness_request <> "" + sub.thickness_request = 输入.thickness_request + ENDOPTION + OPTION 输入.bill_type <> "" + mst.bill_type = 输入.bill_type + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.input_time >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.input_time <= 输入.end_time + ENDOPTION + + OPTION 输入.with <> "" + CONCAT( sub.thickness_request,'*',sub.width) = 输入.with + ENDOPTION + + OPTION 输入.classes = "1" + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '19:59:59' + ENDOPTION + + OPTION 输入.classes = "2" + ( + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + OR + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + ) + ENDOPTION + + order by confirm_time_class + + ENDSELECT + ENDPAGEQUERY + ENDIF + + IF 输入.flag = "4" + PAGEQUERY + SELECT + MAX(mst.stor_name) AS stor_name, + MAX(dis.sect_name) AS sect_name, + MAX(dis.struct_code) AS struct_code, + MAX(dis.struct_name) AS struct_name, + MAX(mst.bill_type) AS bill_type, + MAX(mater.material_code) AS material_code, + MAX(mater.material_name) AS material_name, + MAX(dis.qty_unit_name) AS qty_unit_name, + MAX(sub.customer_description) AS customer_description, + MAX(mst.input_optname) AS input_optname, + MAX(mst.remark) AS remark, + mst.iostorinv_id, + dis.box_no, + MAX(sub.customer_name) AS customer_name, + MAX(sub.sale_order_name) AS sale_order_name, + MAX(sub.date_of_production) AS date_of_production, + SUM(sub.net_weight) AS net_weight, + MAX(mst.input_time) AS input_time, + MAX(mst.confirm_time) AS confirm_time, + CONCAT_WS('',MAX(sub.thickness_request),'*',MAX(sub.width)) AS specification, + CONCAT( MAX(sub.box_length),'*',MAX(sub.box_width),'*',MAX(sub.box_high)) AS box_size, + (case when DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '19:59:59' then '白班' + when (( + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + OR + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + )) then '晚班' end) AS classes, + CASE + WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >= '08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + THEN mst.confirm_time + WHEN DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >= '00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + THEN DATE_SUB(mst.confirm_time,INTERVAL 1 day) + END AS confirm_time_class + + FROM + st_ivt_iostorinvdis dis + LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + LEFT JOIN st_ivt_sectattr sect ON sect.sect_id = dis.sect_id + LEFT JOIN md_me_materialbase mater ON mater.material_id = dis.material_id + LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND sub.package_box_sn = dis.box_no + WHERE + mst.io_type = '0' + AND mst.is_delete = '0' + AND mst.bill_status = '99' + + OPTION 输入.stor_id <> "" + mst.stor_id = 输入.stor_id + ENDOPTION + + OPTION 输入.is_virtual = "0" + sect.sect_type_attr <> '09' + ENDOPTION + OPTION 输入.is_virtual = "1" + sect.sect_type_attr = '09' + ENDOPTION + OPTION 输入.areas <> "" + LEFT(sub.container_name,2) IN 输入.areas + ENDOPTION + OPTION 输入.thickness_request <> "" + sub.thickness_request = 输入.thickness_request + ENDOPTION + OPTION 输入.bill_type <> "" + mst.bill_type = 输入.bill_type + ENDOPTION + + OPTION 输入.begin_time <> "" + mst.input_time >= 输入.begin_time + ENDOPTION + + OPTION 输入.end_time <> "" + mst.input_time <= 输入.end_time + ENDOPTION + + OPTION 输入.with <> "" + CONCAT( sub.thickness_request,'*',sub.width) = 输入.with + ENDOPTION + + OPTION 输入.classes = "1" + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='08:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '19:59:59' + ENDOPTION + + OPTION 输入.classes = "2" + ( + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='20:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '23:59:59' + OR + DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) >='00:00:00' AND DATE_FORMAT( mst.confirm_time, '%H:%i:%s' ) <= '07:59:59' + ) + ENDOPTION + GROUP BY + mst.iostorinv_id, + dis.box_no + + order by confirm_time_class + ENDSELECT ENDPAGEQUERY ENDIF \ No newline at end of file diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue index 5e9ffc639..626e1915b 100644 --- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue +++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index.vue @@ -29,7 +29,7 @@ - + @@ -64,7 +63,7 @@ v-model="query.with" size="mini" clearable - placeholder="例如：68*9.5" + placeholder="例如：8*868" @keyup.enter.native="crud.toQuery" /> @@ -175,6 +174,7 @@ + @@ -219,7 +219,7 @@ export default { optShow: { add: false, reset: true }, idField: 'iostorinv_id', url: '/api/in/InQuery', - query: { 'is_all': '0' }, + query: { 'is_all': '0', 'bill_type': '0001', 'createTime': [new Date().daysAgo(7), new Date()] }, crudMethod: { ...crudInbillquery } }) }, @@ -246,22 +246,35 @@ export default { }) }, methods: { + [CRUD.HOOK.beforeRefresh]() { + return true + }, + selectTime() { + var date = new Date() + var y = date.getFullYear() + var m = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1 + var d = date.getDate() < 10 ? '0' + date.getDate() : date.getDate() + + var start_day = y + '-' + m + '-' + '01' + ' ' + '00:00:00' + var end_day = `${y}-${m}-${d}` + ' ' + '23:59:59' + this.query.createTime = [new Date(start_day), new Date(end_day)] + }, bill_typeFormat(row, column) { return this.dict.label.ST_INV_IN_TYPE[row.bill_type] }, downdtl() { if (this.currentRow !== null) { - crud.downloadLoading = true const data = this.crud.query if (this.crud.query.createTime !== undefined) { data.begin_time = this.crud.query.createTime[0] data.end_time = this.crud.query.createTime[1] } + this.showDtlLoading = true download('/api/in/InQuery/download', data).then(result => { downloadFile(result, '成品入库查询', 'xlsx') - crud.downloadLoading = false + this.showDtlLoading = false }).catch(() => { - crud.downloadLoading = false + this.showDtlLoading = false }) } } From 2426d5e376f3d1ec4b4f004d8821c8743d732f57 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Thu, 13 Jul 2023 17:31:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=20=E6=9B=B4=E6=96=B0agv=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java index 47f392bfd..4ab2cef6e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java @@ -227,17 +227,16 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable { } } + if (!ObjectUtil.isEmpty(data)) { + write(data); + data = null; + } } else { System.out.println("agv上报不是0073类型动作，不处理"); } } - if (!ObjectUtil.isEmpty(data)) { - write(data); - data = null; - } - } catch (Exception e) { System.out.println("OneAgv链接异常"); log.info("OneAgv链接异常"); From 02364658a5591316ac6dfb1c7a9e53544ae8bbda Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 14 Jul 2023 16:33:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?rev=EF=BC=9A=E7=94=9F=E4=BA=A7=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=9B=9E=E4=BC=A0=E4=BF=AE=E6=94=B9=E3=80=81agv?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=85=85=E7=94=B5=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java | 5 ++++- .../st/returns/service/impl/InAndOutRetrunServiceImpl.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 4233749a2..202e8534a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -337,12 +337,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String car_no = whereJson.getString("car_no"); JSONObject jsonParam = new JSONObject(); - if ("2,3".contains(car_no)) { + if ("2,3,4,5".contains(car_no)) { jsonParam.put("agv_system", "2"); jsonParam.put("car_no", car_no); } else if ("1".contains(car_no)) { jsonParam.put("agv_system", "1"); jsonParam.put("car_no", car_no); + } else if ("6,7,8,9".contains(car_no)) { + jsonParam.put("agv_system", "3"); + jsonParam.put("car_no", car_no); } try { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index 9ed35917b..4b42795f9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -757,6 +757,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } @Override + @Transactional public void upload(JSONObject whereJson) { //出库分配表 WQLObject wo_dis = WQLObject.getWQLObject("ST_IVT_IOStorInvDis"); From aa2b52224924426951a7ad7585ea467545e14ea0 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 17 Jul 2023 16:20:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?rev:=20=E5=85=A5=E5=BA=93=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InBillQueryServiceImpl.java | 46 +++++++++++++++++-- .../nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql | 20 ++++---- 2 files changed, 51 insertions(+), 15 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 10089ebcc..21980447d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -1,5 +1,6 @@ package org.nl.wms.stat.service.impl; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; @@ -62,12 +63,30 @@ public class InBillQueryServiceImpl implements InBillQueryService { map.put("stor_id", stor_id); map.put("bill_type", bill_type); map.put("with", with); - map.put("begin_time", begin_time); - map.put("end_time", end_time); map.put("is_virtual", is_virtual); map.put("classes", classes); map.put("thickness_request", thickness_request); + // 处理时间 + if (ObjectUtil.isNotEmpty(begin_time) && ObjectUtil.isNotEmpty(end_time)) { + String begin_time_today = begin_time.substring(0, 10); + String end_time_today = end_time.substring(0, 10); + + + // 开始时间 + String today_begin_time = begin_time_today + " 08:00:00"; + + // 结束时间：19:59:59 + DateTime parse = DateUtil.parse(end_time_today); + String substring = DateUtil.offsetDay(parse, 1).toString().substring(0, 10); + + String today_end_time = substring + " 07:59:59"; + + map.put("begin_time", today_begin_time); + map.put("end_time", today_end_time); + } + + if (ObjectUtil.isNotEmpty(product_area)) { String areas = "("; for (int i = 0; i < product_area.length; i++) { @@ -79,7 +98,7 @@ public class InBillQueryServiceImpl implements InBillQueryService { } map.put("areas", areas); } - JSONObject json = WQL.getWO("ST_IVT_INBILLQUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.input_time DESC,dis.box_no"); + JSONObject json = WQL.getWO("ST_IVT_INBILLQUERY").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "mst.confirm_time DESC,dis.box_no"); return json; } @@ -141,12 +160,29 @@ public class InBillQueryServiceImpl implements InBillQueryService { mapParam.put("stor_id", stor_id); mapParam.put("bill_type", bill_type); mapParam.put("with", with); - mapParam.put("begin_time", begin_time); - mapParam.put("end_time", end_time); mapParam.put("is_virtual", is_virtual); mapParam.put("classes", classes); mapParam.put("thickness_request", thickness_request); + // 处理时间 + if (ObjectUtil.isNotEmpty(begin_time) && ObjectUtil.isNotEmpty(end_time)) { + String begin_time_today = begin_time.substring(0, 10); + String end_time_today = end_time.substring(0, 10); + + + // 开始时间 + String today_begin_time = begin_time_today + " 08:00:00"; + + // 结束时间：19:59:59 + DateTime parse = DateUtil.parse(end_time_today); + String substring = DateUtil.offsetDay(parse, 1).toString().substring(0, 10); + + String today_end_time = substring + " 07:59:59"; + + mapParam.put("begin_time", today_begin_time); + mapParam.put("end_time", today_end_time); + } + if (ObjectUtil.isNotEmpty(product_area)) { String areas = "("; for (int i = 0; i < product_area.length; i++) { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql index cd82571bd..45e4a7bc6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql @@ -129,11 +129,11 @@ ENDOPTION OPTION 输入.begin_time <> "" - mst.input_time >= 输入.begin_time + mst.confirm_time >= 输入.begin_time ENDOPTION OPTION 输入.end_time <> "" - mst.input_time <= 输入.end_time + mst.confirm_time <= 输入.end_time ENDOPTION OPTION 输入.with <> "" @@ -225,11 +225,11 @@ ENDOPTION OPTION 输入.begin_time <> "" - mst.input_time >= 输入.begin_time + mst.confirm_time >= 输入.begin_time ENDOPTION OPTION 输入.end_time <> "" - mst.input_time <= 输入.end_time + mst.confirm_time <= 输入.end_time ENDOPTION OPTION 输入.with <> "" @@ -337,11 +337,11 @@ ENDOPTION OPTION 输入.begin_time <> "" - mst.input_time >= 输入.begin_time + mst.confirm_time >= 输入.begin_time ENDOPTION OPTION 输入.end_time <> "" - mst.input_time <= 输入.end_time + mst.confirm_time <= 输入.end_time ENDOPTION OPTION 输入.with <> "" @@ -360,7 +360,7 @@ ) ENDOPTION - order by confirm_time_class + order by confirm_time ENDSELECT ENDPAGEQUERY @@ -435,11 +435,11 @@ ENDOPTION OPTION 输入.begin_time <> "" - mst.input_time >= 输入.begin_time + mst.confirm_time >= 输入.begin_time ENDOPTION OPTION 输入.end_time <> "" - mst.input_time <= 输入.end_time + mst.confirm_time <= 输入.end_time ENDOPTION OPTION 输入.with <> "" @@ -461,7 +461,7 @@ mst.iostorinv_id, dis.box_no - order by confirm_time_class + order by confirm_time ENDSELECT ENDPAGEQUERY