From 4a07d1a0c429ba58153ea3cf8b0f3ae52b4e9d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Mon, 22 Jun 2026 18:35:40 +0800 Subject: [PATCH 01/37] =?UTF-8?q?=E5=8F=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pickingOrder/PickingOrderApplicationService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 978179bc3..d16e3377d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -825,10 +825,10 @@ public class PickingOrderApplicationService { if (split.length == 2) { item.put("gNo", split[1]); } else { - item.put("gNo", ""); // 出仓订单行号 + item.put("gNo", "1"); // 出仓订单行号 } } else { - item.put("gNo", ""); // 出仓订单行号 + item.put("gNo", "1"); // 出仓订单行号 } @@ -856,10 +856,10 @@ public class PickingOrderApplicationService { if (split.length == 2) { item.put("orderRow", split[1]);// 出仓订单行号 } else { - item.put("orderRow", ""); // 出仓订单行号 + item.put("orderRow", "1"); // 出仓订单行号 } } else { - item.put("orderRow", ""); // 出仓订单行号 + item.put("orderRow", "1"); // 出仓订单行号 } if (bondInvtNo != null && invtRow != null) { item.put("bondInvtNo", "BONDINV202603300001"); // 原进口核注清单号 From 7babb53e90c8e0b660a32bc31c0a05edbaeacdd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 09:29:31 +0800 Subject: [PATCH 02/37] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E6=8E=A8=E9=80=81bug?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationStockInOrderApplicationService.java | 6 ++++-- .../ReservationStockOutOrderApplicationService.java | 6 ++++-- .../pickingOrder/PickingOrderApplicationService.java | 6 ++++-- .../stockInOrder/StockInOrderApplicationService.java | 5 ++++- .../stockOutOrder/StockOutOrderApplicationService.java | 6 ++++-- .../StockShelfOrderApplicationService.java | 6 ++++-- .../stockInOrder/repository/todo/StockInOrderDO.java | 9 +++++++++ .../wms/interfaces/dto/stockInOrder/StockInOrderDTO.java | 9 +++++++++ .../resources/mapper/stockInOrder/StockInOrderMapper.xml | 9 +++++++++ 9 files changed, 51 insertions(+), 11 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index 8ce1b3c5a..f1cdd3e74 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -2060,8 +2060,10 @@ public class ReservationStockInOrderApplicationService { CloseableHttpResponse response = httpClient.execute(httpPost); String responseString = EntityUtils.toString(response.getEntity()); gwLog.setResponseBody(responseString); - - if (response.getStatusLine().getStatusCode() == 200) { +// 直接转Map + Map map = JSON.parseObject(responseString); + Integer code = (Integer) map.get("code"); + if (response.getStatusLine().getStatusCode() == 200&&code == 200) { gwLog.setStatus(2); updatePushStatus(id, 3, new Date(), pushBy,pushByName); successCount++; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java index 827444137..b28a44f60 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java @@ -1471,8 +1471,10 @@ public class ReservationStockOutOrderApplicationService { CloseableHttpResponse response = httpClient.execute(httpPost); String responseString = EntityUtils.toString(response.getEntity()); gwLog.setResponseBody(responseString); - - if (response.getStatusLine().getStatusCode() == 200) { + // 直接转Map + Map map = JSON.parseObject(responseString); + Integer code = (Integer) map.get("code"); + if (response.getStatusLine().getStatusCode() == 200&&code ==200) { gwLog.setStatus(2); updatePushStatus(id, 3, new Date(), pushBy,pushByName); successCount++; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index d16e3377d..8ce64e186 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -923,8 +923,10 @@ public class PickingOrderApplicationService { CloseableHttpResponse response = httpClient.execute(httpPost); String responseString = EntityUtils.toString(response.getEntity()); gwLogDTO.setResponseBody(responseString); - - if (response.getStatusLine().getStatusCode() == 200) { + // 直接转Map + Map map = JSON.parseObject(responseString); + Integer code = (Integer) map.get("code"); + if (response.getStatusLine().getStatusCode() == 200&&code==200) { gwLogDTO.setStatus(2); updatePushStatus(id, 3, new Date(), pushBy,pushByName); successCount++; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 066886cc0..1c3411403 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -2405,8 +2405,11 @@ public class StockInOrderApplicationService { CloseableHttpResponse response = httpClient.execute(httpPost); String responseString = EntityUtils.toString(response.getEntity()); gwLogDTO.setResponseBody(responseString); + // 直接转Map + Map map = JSON.parseObject(responseString); + Integer code = (Integer) map.get("code"); - if (response.getStatusLine().getStatusCode() == 200) { + if (response.getStatusLine().getStatusCode() == 200&&code == 200) { gwLogDTO.setStatus(2); updatePushStatus(id, 3, new Date(), pushBy,pushByName); successCount++; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index ede21b749..22ae90c74 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1682,8 +1682,10 @@ public class StockOutOrderApplicationService { CloseableHttpResponse response = httpClient.execute(httpPost); String responseString = EntityUtils.toString(response.getEntity()); gwLogDTO.setResponseBody(responseString); - - if (response.getStatusLine().getStatusCode() == 200) { + // 直接转Map + Map map = JSON.parseObject(responseString); + Integer code = (Integer) map.get("code"); + if (response.getStatusLine().getStatusCode() == 200&&code==200) { gwLogDTO.setStatus(2); updatePushStatus(id, 3, new Date(), pushBy,pushByName); successCount++; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 894d71b88..d205ff2ee 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -2859,8 +2859,10 @@ public class StockShelfOrderApplicationService { CloseableHttpResponse response = httpClient.execute(httpPost); String responseString = EntityUtils.toString(response.getEntity()); gwLogDTO.setResponseBody(responseString); - - if (response.getStatusLine().getStatusCode() == 200) { +// 直接转Map + Map map = JSON.parseObject(responseString); + Integer code = (Integer) map.get("code"); + if (response.getStatusLine().getStatusCode() == 200&&code == 200) { gwLogDTO.setStatus(2); updatePushStatus(id, 3, new Date(), pushBy,pushByName); successCount++; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index 9b79d1df1..8a55e4aef 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -410,4 +410,13 @@ public class StockInOrderDO extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeStart; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeEnd; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index dc527df1c..a3c331a3b 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -408,4 +408,13 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeStart; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeEnd; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index 78455c712..ff372c317 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -418,6 +418,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} + + and PUSH_TIME #{pushTimeEnd} + + + and a.PUSH_STATUS = #{pushStatus} + + + and a.PUSH_STATUS = #{pushStatus} + and exists ( From 0cf697a03b683e62b1ea6f2a97d536b126393ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 09:46:07 +0800 Subject: [PATCH 03/37] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E4=BF=9D=E7=A8=8E?= =?UTF-8?q?=E4=BB=93=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/todo/ReservationStockInOrderDO.java | 4 ++-- .../repository/todo/ReservationStockInOrderDTO.java | 4 ++-- .../repository/todo/ReservationStockOutOrderDO.java | 4 ++-- .../repository/todo/ReservationStockOutOrderDTO.java | 4 ++-- .../ReservationStockInOrderMapper.xml | 8 ++++---- .../ReservationStockOutOrderMapper.xml | 8 ++++---- .../pickingOrder/repository/todo/PickingOrderDO.java | 4 ++-- .../stockInOrder/repository/todo/StockInOrderDO.java | 4 ++-- .../stockOutOrder/repository/todo/StockOutOrderDO.java | 9 +++++++++ .../repository/todo/StockShelfOrderDO.java | 4 ++-- .../wms/interfaces/dto/pickingOrder/PickingOrderDTO.java | 4 ++-- .../wms/interfaces/dto/stockInOrder/StockInOrderDTO.java | 4 ++-- .../interfaces/dto/stockOutOrder/StockOutOrderDTO.java | 9 +++++++++ .../dto/stockShelfOrder/StockShelfOrderDTO.java | 4 ++-- .../resources/mapper/pickingOrder/PickingOrderMapper.xml | 8 ++++---- .../resources/mapper/stockInOrder/StockInOrderMapper.xml | 8 ++++---- .../mapper/stockOutOrder/StockOutOrderMapper.xml | 9 +++++++++ .../mapper/stockShelfOrder/StockShelfOrderMapper.xml | 8 ++++---- 18 files changed, 67 insertions(+), 40 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java index 9118c756f..ce1d39cd6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java @@ -470,12 +470,12 @@ public class ReservationStockInOrderDO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; private String xfStatus; @ApiModelProperty("运输业务单号") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java index 4e7385990..0e22e4896 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java @@ -454,12 +454,12 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; private String xfStatus; @ApiModelProperty(name = "入库时间查询条件开始日期") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java index 7b57c1956..33db3338d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java @@ -549,12 +549,12 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; private String xfStatus; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java index 3c5fc2885..481dd1ae8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java @@ -532,12 +532,12 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; @ApiModelProperty(name = "出库时间查询条件开始日期") private String outboundDateStart; diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml index 948753d7f..b0c5f5df6 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -429,11 +429,11 @@ and a.create_time DATEADD(DAY, 1, #{createTimeEnd}) - - and PUSH_TIME =]]> #{pushTimeStart} + + and a.PUSH_TIME =]]> #{pushTimeFrom} - - and PUSH_TIME #{pushTimeEnd} + + and a.PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml index 8cc70cf7f..f54fffe06 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -309,11 +309,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.NEED_DECLARE_FLAG = #{needDeclareFlag} - - and PUSH_TIME =]]> #{pushTimeStart} + + and a.PUSH_TIME =]]> #{pushTimeFrom} - - and PUSH_TIME #{pushTimeEnd} + + and a.PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java index a778a9989..568496285 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java @@ -213,10 +213,10 @@ public class PickingOrderDO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index 8a55e4aef..51315fe12 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -413,10 +413,10 @@ public class StockInOrderDO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java index c6df1343e..f1aac3bb8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java @@ -471,4 +471,13 @@ public class StockOutOrderDO extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java index 74c0dece2..6cd9a2080 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java @@ -158,10 +158,10 @@ public class StockShelfOrderDO extends StockInOrderBaseDO { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java index c56c2d5c1..8b23f2983 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java @@ -181,10 +181,10 @@ public class PickingOrderDTO extends BaseVOEntity { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index a3c331a3b..5c419aa2d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -411,10 +411,10 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index 129236658..b5e7cda80 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -465,4 +465,13 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { @ApiModelProperty("推送人姓名") private String pushByName; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java index 945b8c37f..35d44962f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java @@ -147,10 +147,10 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO { @ApiModelProperty(value = "推送时间起") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeStart; + private Date pushTimeFrom; @ApiModelProperty(value = "推送时间止") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date pushTimeEnd; + private Date pushTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index bda2d57ca..a28914e82 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -117,11 +117,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.need_declare_flag = #{needDeclareFlag} - - and PUSH_TIME =]]> #{pushTimeStart} + + and PUSH_TIME =]]> #{pushTimeFrom} - - and PUSH_TIME #{pushTimeEnd} + + and PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index ff372c317..1eff7dba9 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -418,11 +418,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} - - and PUSH_TIME #{pushTimeEnd} + + and PUSH_TIME =]]> #{pushTimeFrom} - - and a.PUSH_STATUS = #{pushStatus} + + and PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 3a2da9f3b..0602439d9 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -312,6 +312,15 @@ and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd} + + and PUSH_TIME =]]> #{pushTimeFrom} + + + and PUSH_TIME #{pushTimeTo} + + + and a.PUSH_STATUS = #{pushStatus} + and exists ( diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml index dea1de001..3bde4a693 100644 --- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml @@ -110,11 +110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} - - and PUSH_TIME =]]> #{pushTimeStart} + + and PUSH_TIME =]]> #{pushTimeFrom} - - and PUSH_TIME #{pushTimeEnd} + + and PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} From 32efb1dfe59d59837f012c9084cd1f2e4884abc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 09:58:48 +0800 Subject: [PATCH 04/37] =?UTF-8?q?=E6=8E=A8=E9=80=81=E4=BA=BA=E5=9B=9E?= =?UTF-8?q?=E6=98=BEpo=20username?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/pickingOrder/PickingOrderApplicationService.java | 2 +- .../service/stockInOrder/StockInOrderApplicationService.java | 2 +- .../service/stockOutOrder/StockOutOrderApplicationService.java | 2 +- .../stockShelfOrder/StockShelfOrderApplicationService.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 8ce64e186..ea4fb55ce 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -730,7 +730,7 @@ public class PickingOrderApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); Long pushBy = loginUser != null ? loginUser.getUserid() : null; - String pushByName = loginUser != null ? loginUser.getUsername() : null; + String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 1c3411403..16ada8f83 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -2304,7 +2304,7 @@ public class StockInOrderApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); Long pushBy = loginUser != null ? loginUser.getUserid() : null; - String pushByName = loginUser != null ? loginUser.getUsername() : null; + String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 22ae90c74..0fce75534 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1515,7 +1515,7 @@ public class StockOutOrderApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); Long pushBy = loginUser != null ? loginUser.getUserid() : null; - String pushByName = loginUser != null ? loginUser.getUsername() : null; + String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index d205ff2ee..0cd368924 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -2648,7 +2648,7 @@ public class StockShelfOrderApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); Long pushBy = loginUser != null ? loginUser.getUserid() : null; - String pushByName = loginUser != null ? loginUser.getUsername() : null; + String pushByName = loginUser != null ? loginUser.getUserPo().getUserName() : null; Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; From afa6ed0685736ae6e620c08a142132ac71fec361 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 10:03:32 +0800 Subject: [PATCH 05/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessDocumentOrder/BusinessDocumentOrderMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml index a4059ad3e..56ea9d2ff 100644 --- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml @@ -690,13 +690,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bdo.DOCUMENT_DATE =]]> #{documentDateStart} - and bdo.DOCUMENT_DATE #{documentDateEnd} + and bdo.DOCUMENT_DATE #{documentDateEnd} + 1 - 1/86400 and bdo.PUSH_TIME =]]> #{pushTimeStart} - and bdo.PUSH_TIME #{pushTimeEnd} + and bdo.PUSH_TIME #{pushTimeEnd} + 1 - 1/86400 and bdo.IE_TYPE = #{ieType} @@ -1246,13 +1246,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DOCUMENT_DATE =]]> #{documentDateStart} - and DOCUMENT_DATE #{documentDateEnd} + and DOCUMENT_DATE #{documentDateEnd} + 1 - 1/86400 and PUSH_TIME =]]> #{pushTimeStart} - and PUSH_TIME #{pushTimeEnd} + and PUSH_TIME #{pushTimeEnd} + 1 - 1/86400 and IE_TYPE = #{ieType} From f32f5b48bce93ce9b8b7078de9ab55b93ece2e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 10:15:52 +0800 Subject: [PATCH 06/37] =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=88=90=E5=93=81?= =?UTF-8?q?=E7=89=A9=E6=96=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/pickingOrder/repository/po/PickingOrderPO.java | 2 ++ .../resources/mapper/pickingOrder/PickingOrderMapper.xml | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java index 11aafedc9..02fa68661 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java @@ -166,4 +166,6 @@ public class PickingOrderPO extends StockOutOrderBasePO { @ApiModelProperty("规格型号") @Excel(name = "规格型号") private String specificationModel; + @ApiModelProperty("货物类型 0-物料 1-半成品 2-成品") + private Integer goodsType; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index a28914e82..4a994e99e 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -46,7 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" IFNULL((SELECT SUM(b.picking_quantity) FROM picking_material_detail b WHERE b.picking_order_number = a.picking_order_number AND b.del_flag = 1), 0) AS picking_quantity, a.picking_material_quantity, a.abnormal, a.task_distribution, a.remark, a.create_time, a.create_by, a.create_by_name, a.update_time, a.update_by, a.update_by_name, a.del_flag,a.out_order_number, a.business_order_no, a.order_type_code, a.order_type_name, a.priority_level_code, a.priority_level_name - ,a.push_status,a.push_time,a.push_by,a.push_by_name + ,a.push_status,a.push_time,a.push_by,a.push_by_name, + (SELECT m.goods_type FROM PICKING_MATERIAL_DETAIL d + JOIN material_base_info m ON d.material_base_info_id = m.material_base_info_id + WHERE d.PICKING_ORDER_NUMBER = a.PICKING_ORDER_NUMBER AND d.level = 1 + LIMIT 1) AS goods_type From d04df87e19defef10e9be7ba7fec76ed2e333e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 10:50:23 +0800 Subject: [PATCH 07/37] =?UTF-8?q?=E6=8A=A5=E5=85=B3=E5=9B=9E=E5=86=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PickingOrderApplicationService.java | 20 +++++++++++++++++-- .../StockShelfOrderApplicationService.java | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index ea4fb55ce..68916a079 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -22,6 +22,8 @@ import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO; import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.application.service.materialBaseInfo.MaterialBaseInfoApplicationService; +import com.mhd.wms.domain.customsDeclarationDetail.repository.facade.ICustomsDeclarationDetailService; +import com.mhd.wms.domain.customsDeclarationDetail.repository.todo.CustomsDeclarationDetailDO; import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService; @@ -93,7 +95,8 @@ public class PickingOrderApplicationService { private IPickingMaterialDetailService pickingMaterialDetailService; @Autowired private IInMaterialDetailService inMaterialDetailService; - + @Autowired + private ICustomsDeclarationDetailService customsDeclarationDetailService; private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_qnBill_e"; @@ -784,7 +787,7 @@ public class PickingOrderApplicationService { CloseableHttpResponse customsResponse = customsHttpClient.execute(customsHttpPost); String customsResponseString = EntityUtils.toString(customsResponse.getEntity()); - + log.info("customsResponseString:{}", customsResponseString); if (customsResponse.getStatusLine().getStatusCode() == 200) { JSONObject customsJson = JSONObject.parseObject(customsResponseString); JSONArray customsData = customsJson.getJSONArray("data"); @@ -803,6 +806,19 @@ public class PickingOrderApplicationService { log.error("调用报关回写接口失败: pickingOrderNumber={}", pickingOrder.getPickingOrderNumber(), e); } + // ========== 写入报关明细表 ========== + if (StringUtils.isNotBlank(bondInvtNo)) { + CustomsDeclarationDetailDO detailDO = new CustomsDeclarationDetailDO(); + detailDO.setDocumentNumber(pickingOrder.getPickingOrderNumber()); + detailDO.setBondInvtNo(bondInvtNo); + detailDO.setInvtRow(invtRow); + detailDO.setInOrderNumber(pickingOrder.getOrderNumber()); + detailDO.setOrganizationId(pickingOrder.getOrganizationId()); + detailDO.setOrganizationName(pickingOrder.getOrganizationName()); + detailDO.setTopOrganizationId(pickingOrder.getTopOrganizationId()); + customsDeclarationDetailService.insert(detailDO); + } + // 3. 构建主单 Map order = new HashMap<>(); // etpsPreentNo: 入库单号 - 取拣货明细中的入库单号（第一个） diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 0cd368924..f9e545f42 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -2712,7 +2712,7 @@ public class StockShelfOrderApplicationService { CloseableHttpResponse customsResponse = customsHttpClient.execute(customsHttpPost); String customsResponseString = EntityUtils.toString(customsResponse.getEntity()); - + log.info("customsResponseString:{}", customsResponseString); if (customsResponse.getStatusLine().getStatusCode() == 200) { com.alibaba.fastjson.JSONObject customsJson = com.alibaba.fastjson.JSONObject.parseObject(customsResponseString); com.alibaba.fastjson.JSONArray customsData = customsJson.getJSONArray("data"); From 7a7038e7941560210e82f201a5c357b6378f866b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 10:52:02 +0800 Subject: [PATCH 08/37] =?UTF-8?q?=E5=8F=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mhd_wms/src/main/resources/bootstrap.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index fc7380c20..922e3a301 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -14,20 +14,20 @@ spring: nacos: discovery: # server-addr: 127.0.0.1:8848 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.30:6848 - username: nacos - password: manhuoda@2023 +# server-addr: 10.102.192.30:6848 +# username: nacos +# password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 -# server-addr: 10.33.0.129:6010 + server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.30:6848 - username: nacos - password: manhuoda@2023 +# server-addr: 10.102.192.30:6848 +# username: nacos +# password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 # 配置文件格式 From 3360e500dcaba2d2eeebed6bcc6bf1dd684669cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 11:48:47 +0800 Subject: [PATCH 09/37] =?UTF-8?q?=E5=8F=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/pickingOrder/PickingOrderMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index 4a994e99e..2c3e1bb51 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ,a.push_status,a.push_time,a.push_by,a.push_by_name, (SELECT m.goods_type FROM PICKING_MATERIAL_DETAIL d JOIN material_base_info m ON d.material_base_info_id = m.material_base_info_id - WHERE d.PICKING_ORDER_NUMBER = a.PICKING_ORDER_NUMBER AND d.level = 1 + WHERE d.PICKING_ORDER_NUMBER = a.PICKING_ORDER_NUMBER LIMIT 1) AS goods_type From b4f685a25d171950de4ce5c1592abe147fcb100e Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 14:01:41 +0800 Subject: [PATCH 10/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E8=B4=B8=E6=98=93=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mhd/system/api/WmsServiceFeign.java | 6 ++ .../api/factory/RemoteWmsFallbackFactory.java | 9 +++ .../MaterialInfoApplicationService.java | 42 +++++++++++ .../entity/MaterialPushRecord.java | 65 +++++++++++++++++ .../mapper/MaterialPushRecordMapper.java | 9 +++ .../service/MaterialPushRecordService.java | 73 +++++++++++++++++++ .../MaterialPushRecordApi.java | 25 +++++++ .../MaterialPushRecordMapper.xml | 28 +++++++ 8 files changed, 257 insertions(+) create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/repository/mapper/MaterialPushRecordMapper.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java create mode 100644 mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index 9a459adc1..b7698b1cc 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -115,4 +115,10 @@ public interface WmsServiceFeign { @RequestParam(value = "pushTime",required = false) String pushTime, @RequestParam(value = "pushBy",required = false) Long pushBy, @RequestParam(value = "pushByName",required = false) String pushByName); + + /** + * 根据物料ID列表批量查询物料信息 + */ + @GetMapping("/materialBaseInfoApi/getBatchByIds") + public TableDataInfo getBatchByIds(@RequestParam("materialBaseInfoIds") List materialBaseInfoIds); } \ No newline at end of file diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java index a62144e1f..55ab7572a 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java @@ -90,6 +90,15 @@ public class RemoteWmsFallbackFactory implements FallbackFactory updateMaterialPushStatus(Long materialBaseInfoId, Integer pushStatus, String pushTime, Long pushBy, String pushByName) { return AjaxResult.error(cause.getMessage()); } + + @Override + public TableDataInfo getBatchByIds(List materialBaseInfoIds) { + TableDataInfo tableDataInfo = new TableDataInfo(); + tableDataInfo.setData(new ArrayList<>()); + tableDataInfo.setTotal(0); + tableDataInfo.setCode(500); + return tableDataInfo; + } }; } } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java index 15f15da38..57627ebb5 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java @@ -2,6 +2,7 @@ package com.mhd.oms.application.service.materialInfo; import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.mhd.common.core.exception.ServiceException; import com.mhd.common.core.web.domain.AjaxResult; @@ -9,6 +10,9 @@ import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.oms.domain.gwLog.entity.GwLog; import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper; +import com.mhd.oms.domain.materialPushRecord.entity.MaterialPushRecord; +import com.mhd.oms.domain.materialPushRecord.repository.mapper.MaterialPushRecordMapper; +import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO; import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper; import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.domain.MaterialInfoDTO; @@ -45,6 +49,9 @@ public class MaterialInfoApplicationService { @Resource private BusinessDocumentOrderMapper businessDocumentOrderMapper; + @Resource + private MaterialPushRecordMapper materialPushRecordMapper; + private final WmsServiceFeign wmsServiceFeign; public MaterialInfoApplicationService(WmsServiceFeign wmsServiceFeign) { @@ -88,6 +95,7 @@ public class MaterialInfoApplicationService { int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); + List successIds = new ArrayList<>(); for (MaterialInfoDTO dto : dtoList) { Map item = new HashMap<>(); @@ -147,6 +155,7 @@ public class MaterialInfoApplicationService { gwLog.setStatus(2); updatePushStatus(dto.getMaterialBaseInfoId(), 3, new Date(), pushBy, pushByName); successCount++; + successIds.add(dto.getMaterialBaseInfoId()); } else { gwLog.setStatus(3); gwLog.setErrorMsg(responseString); @@ -181,6 +190,39 @@ public class MaterialInfoApplicationService { } } + // 推送成功后，保存物料快照到物料推送记录表 + if (!successIds.isEmpty()) { + try { + Date now = new Date(); + TableDataInfo wmsResult = wmsServiceFeign.getBatchByIds(successIds); + if (wmsResult != null && wmsResult.getData() != null) { + List materialList = JSONArray.parseArray( + JSONObject.toJSONString(wmsResult.getData()), MaterialBaseInfoPO.class); + for (MaterialBaseInfoPO material : materialList) { + MaterialPushRecord record = new MaterialPushRecord(); + record.setMaterialBaseInfoId(material.getMaterialBaseInfoId()); + record.setMaterialCode(material.getMaterialCode()); + record.setMaterialName(material.getMaterialName()); + record.setGoodsType(material.getGoodsType()); + record.setSpecificationModel(material.getSpecificationModel()); + record.setDeclarationUnit(material.getDeclarationUnit()); + record.setCurrency(material.getCurrency()); + record.setUnitPrice(material.getUnitPrice()); + record.setNetWeight(material.getWeightLimit()); + record.setGrossWeight(material.getGrossWeight()); + record.setPushTime(now); + record.setDelFlag(1); + record.setCreateBy(pushBy); + record.setCreateTime(now); + record.setUpdateTime(now); + materialPushRecordMapper.insert(record); + } + } + } catch (Exception e) { + log.error("保存物料推送快照失败: {}", e.getMessage()); + } + } + String resultMsg = "推送完成: 成功" + successCount + "条, 失败" + failCount + "条"; if (failCount > 0) { resultMsg += "[" + failMsg.toString() + "]"; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java new file mode 100644 index 000000000..57a3e85dd --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java @@ -0,0 +1,65 @@ +package com.mhd.oms.domain.materialPushRecord.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.mhd.common.core.web.domain.BaseVOEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 物料推送记录表 + */ +@Data +@ApiModel(value = "物料推送记录对象") +@TableName("material_push_record") +public class MaterialPushRecord extends BaseVOEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("物料ID") + private Long materialBaseInfoId; + + @ApiModelProperty("物料编码") + private String materialCode; + + @ApiModelProperty("物料名称") + private String materialName; + + @ApiModelProperty("规格型号") + private String specificationModel; + + @ApiModelProperty("申报单位") + private String declarationUnit; + + @ApiModelProperty("数量") + private BigDecimal cargoNum; + + @ApiModelProperty("币制") + private String currency; + + @ApiModelProperty("单价") + private BigDecimal unitPrice; + + @ApiModelProperty("净重(kg)") + private BigDecimal netWeight; + + @ApiModelProperty("毛重(kg)") + private BigDecimal grossWeight; + + @ApiModelProperty("商品类型(0物料，1半成品，2成品)") + private Integer goodsType; + + @ApiModelProperty("推送时间") + private Date pushTime; + + @ApiModelProperty("删除标志(1-正常，2-删除)") + private Integer delFlag; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/repository/mapper/MaterialPushRecordMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/repository/mapper/MaterialPushRecordMapper.java new file mode 100644 index 000000000..cf0e9007e --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/repository/mapper/MaterialPushRecordMapper.java @@ -0,0 +1,9 @@ +package com.mhd.oms.domain.materialPushRecord.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.oms.domain.materialPushRecord.entity.MaterialPushRecord; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MaterialPushRecordMapper extends BaseMapper { +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java new file mode 100644 index 000000000..84d1036ba --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java @@ -0,0 +1,73 @@ +package com.mhd.oms.domain.materialPushRecord.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.mhd.common.core.web.page.TableDataInfo; +import com.mhd.oms.domain.materialPushRecord.entity.MaterialPushRecord; +import com.mhd.oms.domain.materialPushRecord.repository.mapper.MaterialPushRecordMapper; +import com.mhd.system.api.WmsServiceFeign; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@Service +@Slf4j +public class MaterialPushRecordService { + + @Resource + private MaterialPushRecordMapper materialPushRecordMapper; + + @Resource + private WmsServiceFeign wmsServiceFeign; + + /** + * 按物料ID列表查询物料数据 + * 优先查物料推送快照，没有则调WMS查实时数据 + */ + public TableDataInfo getBatchByIds(List materialBaseInfoIds) { + if (materialBaseInfoIds == null || materialBaseInfoIds.isEmpty()) { + TableDataInfo emptyResult = new TableDataInfo(); + emptyResult.setData(new ArrayList<>()); + emptyResult.setTotal(0); + emptyResult.setCode(200); + return emptyResult; + } + + // 1. 先查物料推送记录表 + List pushRecords = materialPushRecordMapper.selectList( + new LambdaQueryWrapper() + .in(MaterialPushRecord::getMaterialBaseInfoId, materialBaseInfoIds) + .eq(MaterialPushRecord::getDelFlag, 1)); + + if (pushRecords != null && !pushRecords.isEmpty()) { + // 检查是否所有请求的物料ID都查到了 + Set foundIds = pushRecords.stream() + .map(MaterialPushRecord::getMaterialBaseInfoId) + .collect(Collectors.toSet()); + if (foundIds.containsAll(materialBaseInfoIds)) { + // 全部ID都有推送快照，直接返回 + TableDataInfo result = new TableDataInfo(); + result.setData(pushRecords); + result.setTotal(pushRecords.size()); + result.setCode(200); + return result; + } + } + + // 2. 有物料没有推送数据，调WMS查全部实时数据 + try { + return wmsServiceFeign.getBatchByIds(materialBaseInfoIds); + } catch (Exception e) { + log.error("调用WMS查询物料信息失败: {}", e.getMessage()); + TableDataInfo errorResult = new TableDataInfo(); + errorResult.setData(new ArrayList<>()); + errorResult.setTotal(0); + errorResult.setCode(500); + return errorResult; + } + } +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java new file mode 100644 index 000000000..e2448e49f --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java @@ -0,0 +1,25 @@ +package com.mhd.oms.interfaces.facade.materialPushRecord; + +import com.mhd.common.core.web.domain.AjaxResult; +import com.mhd.oms.domain.materialPushRecord.service.MaterialPushRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@Api(tags = "物料推送记录") +@RestController +@RequestMapping("/materialPushRecordApi") +public class MaterialPushRecordApi { + + @Resource + private MaterialPushRecordService materialPushRecordService; + + @ApiOperation("批量查询物料推送数据（优先查推送快照，没有则调WMS查实时数据）") + @GetMapping("/getBatchByIds") + public AjaxResult getBatchByIds(@RequestParam("materialBaseInfoIds") List materialBaseInfoIds) { + return AjaxResult.success(materialPushRecordService.getBatchByIds(materialBaseInfoIds)); + } +} diff --git a/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml b/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml new file mode 100644 index 000000000..2df87e3bb --- /dev/null +++ b/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + From 129cd393aaea58b234823d61947ba27698ce7e01 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 14:34:03 +0800 Subject: [PATCH 11/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E8=B4=B8=E6=98=93=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../materialPushRecord/entity/MaterialPushRecord.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java index 57a3e85dd..dac4b94ae 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java @@ -1,6 +1,7 @@ package com.mhd.oms.domain.materialPushRecord.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.mhd.common.core.web.domain.BaseVOEntity; @@ -62,4 +63,10 @@ public class MaterialPushRecord extends BaseVOEntity { @ApiModelProperty("删除标志(1-正常，2-删除)") private Integer delFlag; + + @TableField(exist = false) + private String createByName; + + @TableField(exist = false) + private String updateByName; } From af0f3e81b9f048b6fc327219ac19bd6e8ddc3813 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 15:23:54 +0800 Subject: [PATCH 12/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E8=B4=B8=E6=98=93=E7=9A=84=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MaterialInfoApplicationService.java | 2 +- .../entity/MaterialPushRecord.java | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java index 57627ebb5..670916107 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java @@ -212,7 +212,7 @@ public class MaterialInfoApplicationService { record.setGrossWeight(material.getGrossWeight()); record.setPushTime(now); record.setDelFlag(1); - record.setCreateBy(pushBy); + record.setCreateBy(String.valueOf(pushBy)); record.setCreateTime(now); record.setUpdateTime(now); materialPushRecordMapper.insert(record); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java index dac4b94ae..6ea91988f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java @@ -1,14 +1,13 @@ package com.mhd.oms.domain.materialPushRecord.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.mhd.common.core.web.domain.BaseVOEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -18,7 +17,7 @@ import java.util.Date; @Data @ApiModel(value = "物料推送记录对象") @TableName("material_push_record") -public class MaterialPushRecord extends BaseVOEntity { +public class MaterialPushRecord implements Serializable { private static final long serialVersionUID = 1L; @ApiModelProperty("主键") @@ -64,9 +63,15 @@ public class MaterialPushRecord extends BaseVOEntity { @ApiModelProperty("删除标志(1-正常，2-删除)") private Integer delFlag; - @TableField(exist = false) - private String createByName; + @ApiModelProperty("创建人") + private String createBy; - @TableField(exist = false) - private String updateByName; + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("更新人") + private String updateBy; + + @ApiModelProperty("更新时间") + private Date updateTime; } From 55c780caa19a79c009f37e5b1cc45e3fe5e6bae5 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 15:32:20 +0800 Subject: [PATCH 13/37] sql --- sql/oms20260513.sql | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/sql/oms20260513.sql b/sql/oms20260513.sql index 8f4716f3a..b39d5526b 100644 --- a/sql/oms20260513.sql +++ b/sql/oms20260513.sql @@ -178,3 +178,44 @@ on column NGWL_TEST_OMS.BUSINESS_DOCUMENT_ORDER.REVISE_APPLY_TIME is '删改单 +-- 物料推送记录表 +CREATE TABLE NGWL_TEST_OMS.MATERIAL_PUSH_RECORD ( + ID BIGINT IDENTITY(1,1) NOT NULL, + MATERIAL_BASE_INFO_ID BIGINT, + MATERIAL_CODE VARCHAR(100), + MATERIAL_NAME VARCHAR(255), + SPECIFICATION_MODEL VARCHAR(255), + DECLARATION_UNIT VARCHAR(100), + CARGO_NUM DECIMAL(20,4), + CURRENCY VARCHAR(10), + UNIT_PRICE DECIMAL(20,4), + NET_WEIGHT DECIMAL(20,4), + GROSS_WEIGHT DECIMAL(20,4), + GOODS_TYPE INT, + PUSH_TIME DATETIME, + DEL_FLAG INT DEFAULT 1, + CREATE_BY VARCHAR(100), + CREATE_TIME DATETIME, + UPDATE_BY VARCHAR(100), + UPDATE_TIME DATETIME, + PRIMARY KEY (ID) +); + +COMMENT ON TABLE NGWL_TEST_OMS.MATERIAL_PUSH_RECORD IS '物料推送记录表'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.MATERIAL_BASE_INFO_ID IS '物料ID'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.MATERIAL_CODE IS '物料编码'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.MATERIAL_NAME IS '物料名称'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.SPECIFICATION_MODEL IS '规格型号'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.DECLARATION_UNIT IS '申报单位'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.CARGO_NUM IS '数量'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.CURRENCY IS '币制'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.UNIT_PRICE IS '单价'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.NET_WEIGHT IS '净重(kg)'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.GROSS_WEIGHT IS '毛重(kg)'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.GOODS_TYPE IS '商品类型(0物料，1半成品，2成品)'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.PUSH_TIME IS '推送时间'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.DEL_FLAG IS '删除标志(1-正常，2-删除)'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.CREATE_BY IS '创建人'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.CREATE_TIME IS '创建时间'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.UPDATE_BY IS '更新人'; + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.UPDATE_TIME IS '更新时间'; \ No newline at end of file From 80b604a637279a6bfba8032f400513446a497cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 16:05:00 +0800 Subject: [PATCH 14/37] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=85=B3=E5=8A=A1?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=86=85=E5=AE=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ReservationInMaterialDetail.java | 16 ++++++++++ .../po/ReservationInMaterialDetailPO.java | 15 +++++++++ .../todo/ReservationInMaterialDetailDO.java | 15 +++++++++ .../todo/ReservationInMaterialDetailDTO.java | 15 +++++++++ .../entity/ReservationOutMaterialDetail.java | 20 ++++++++++++ .../po/ReservationOutMaterialDetailPO.java | 17 +++++++++- .../todo/ReservationOutMaterialDetailDO.java | 16 ++++++++++ .../todo/ReservationOutMaterialDetailDTO.java | 16 ++++++++++ ...rvationStockInOrderApplicationService.java | 15 ++++++++- ...vationStockOutOrderApplicationService.java | 16 ++++++++++ .../ReservationInMaterialDetailMapper.xml | 16 ++++++++++ .../ReservationOutMaterialDetailMapper.xml | 20 +++++++++++- .../PickingOrderApplicationService.java | 17 +++++++++- .../StockInOrderApplicationService.java | 10 ++++++ .../StockOutOrderApplicationService.java | 16 ++++++++++ .../StockShelfOrderApplicationService.java | 11 ++++++- .../entity/InMaterialDetail.java | 16 ++++++++++ .../repository/po/InMaterialDetailPO.java | 15 +++++++++ .../repository/todo/InMaterialDetailDO.java | 15 +++++++++ .../entity/OutMaterialDetail.java | 22 +++++++++++++ .../repository/po/OutMaterialDetailPO.java | 22 +++++++++++++ .../repository/todo/OutMaterialDetailDO.java | 22 +++++++++++++ .../entity/PickingMaterialDetail.java | 22 +++++++++++++ .../po/PickingMaterialDetailPO.java | 23 ++++++++++++- .../todo/PickingMaterialDetailDO.java | 22 +++++++++++++ .../entity/ShelfMaterialDetail.java | 14 ++++++++ .../repository/po/ShelfMaterialDetailPO.java | 14 ++++++++ .../todo/ShelfMaterialDetailDO.java | 14 ++++++++ .../inMaterialDetail/InMaterialDetailDTO.java | 14 ++++++++ .../OutMaterialDetailDTO.java | 23 ++++++++++++- .../PickingMaterialDetailDTO.java | 22 +++++++++++++ .../ShelfMaterialDetailDTO.java | 14 ++++++++ .../OutMaterialDetailMapper.xml | 19 ++++++++++- .../InMaterialDetailMapper.xml | 16 ++++++++++ .../PickingMaterialDetailMapper.xml | 32 ++++++++++++++++++- .../ShelfMaterialDetailMapper.xml | 19 ++++++++++- 36 files changed, 621 insertions(+), 10 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java index ce8a63faf..ddd677c15 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java @@ -377,4 +377,20 @@ public class ReservationInMaterialDetail extends BaseVOEntity { private Date drinkDate; @ApiModelProperty("火险保费") private BigDecimal fireInsureFee; + + + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java index ca8cf216c..9394dd4d6 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java @@ -479,4 +479,19 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO private String lotNumber; @ApiModelProperty("火险保费") private BigDecimal fireInsureFee; + + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java index f568ed286..a694c322c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java @@ -444,4 +444,19 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO private BigDecimal unitPrice; @ApiModelProperty("火险保费") private BigDecimal fireInsureFee; + + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java index e7ca37b47..35d6b5ce2 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java @@ -451,4 +451,19 @@ public class ReservationInMaterialDetailDTO extends BaseVOEntity { private String productionDate; @ApiModelProperty("火险保费") private BigDecimal fireInsureFee; + + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java index ef73ae7a6..d0191d560 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java @@ -498,4 +498,24 @@ public class ReservationOutMaterialDetail extends BaseVOEntity { @ApiModelProperty("库存数量") @Excel(name = "库存数量") private BigDecimal stockQuantity; + + + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java index a3c926c62..eff6eaa40 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java @@ -586,5 +586,20 @@ public class ReservationOutMaterialDetailPO extends ReservationStockOutOrderBase @ApiModelProperty("单价") @Excel(name = "单价") private BigDecimal unitPrice; - + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java index 8cc93faf3..2bb863e47 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java @@ -532,4 +532,20 @@ public class ReservationOutMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("调整后面积") @Excel(name = "调整后面积") private BigDecimal adjustedArea; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java index 9c8ec924d..16c980536 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java @@ -524,4 +524,20 @@ public class ReservationOutMaterialDetailDTO extends BaseVOEntity { @ApiModelProperty("调整后面积") @Excel(name = "调整后面积") private BigDecimal adjustedArea; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index f1cdd3e74..ab94db711 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -2006,9 +2006,14 @@ public class ReservationStockInOrderApplicationService { String[] split = lotNo.split("-"); if (split.length == 2) { gwInDetail.setLineNum(split[1]); + reservationInMaterialDetail.setLineNumGw(split[1]); } else { - gwInDetail.setLineNum(""); + gwInDetail.setLineNum("1"); + reservationInMaterialDetail.setLineNumGw("1"); } + } else { + gwInDetail.setLineNum("1"); + reservationInMaterialDetail.setLineNumGw("1"); } gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName()); MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId); @@ -2023,8 +2028,16 @@ public class ReservationStockInOrderApplicationService { if (unitPrice != null && quantity != null && unitPrice.compareTo(BigDecimal.ZERO) != 0&&quantity.compareTo(BigDecimal.ZERO) != 0) { BigDecimal Amount = unitPrice.multiply(quantity).setScale(2, BigDecimal.ROUND_HALF_UP); gwInDetail.setAmount(Amount); + reservationInMaterialDetail.setAmountGw(Amount); } + reservationInMaterialDetail.setQtyGw(quantity); + reservationInMaterialDetail.setSpecGw(materialBaseInfoPO.getSpecificationModel()); + reservationInMaterialDetail.setUnitGw(materialBaseInfoPO.getDeclarationUnit()); + reservationInMaterialDetail.setErpPriceGw(unitPrice); + reservationInMaterialDetail.setErpCurrGw(materialBaseInfoPO.getCurrency()); + reservationInMaterialDetailMapper.updateById(reservationInMaterialDetail); orderList.add(gwInDetail); + } gwStockInOrder.setOrderList(orderList); List list = new LinkedList<>(); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java index b28a44f60..ec748892a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java @@ -1371,11 +1371,14 @@ public class ReservationStockOutOrderApplicationService { String[] split = lotNo.split("-"); if (split.length == 2) { item.put("lineNum", split[1]); + detail.setLineNumGw(split[1]); } else { item.put("lineNum", 1); + detail.setLineNumGw("1"); } } else { item.put("lineNum", 1); + detail.setLineNumGw("1"); } item.put("qty", detail.getQuantity()); @@ -1392,9 +1395,15 @@ public class ReservationStockOutOrderApplicationService { // 计算金额 BigDecimal unitPrice = materialBaseInfoPO.getUnitPrice(); BigDecimal quantity = detail.getQuantity(); + detail.setQtyGw(quantity); + detail.setErpPriceGw(unitPrice); + detail.setErpCurrGw(materialBaseInfoPO.getCurrency()); + detail.setUnitGw(materialBaseInfoPO.getDeclarationUnit()); + detail.setSpecGw(materialBaseInfoPO.getSpecificationModel()); if (unitPrice != null && quantity != null && unitPrice.compareTo(BigDecimal.ZERO) != 0 && quantity.compareTo(BigDecimal.ZERO) != 0) { BigDecimal amount = unitPrice.multiply(quantity).setScale(2, BigDecimal.ROUND_HALF_UP); item.put("amount", amount); + detail.setAmountGw(amount); } } } @@ -1409,12 +1418,15 @@ public class ReservationStockOutOrderApplicationService { if (inOrderNumber != null) { item.put("orderINo", inOrderNumber); + detail.setInOrderNumberGw(inOrderNumber); } if (warehouseCode != null) { item.put("warehouse", warehouseCode); + detail.setWarehouseGw(warehouseCode); } if (opWhLoc != null) { item.put("opWhLoc", opWhLoc); + detail.setOpWhLocGw(opWhLoc); } // billI = 入库单号 if (inOrderNumber != null) { @@ -1425,15 +1437,19 @@ public class ReservationStockOutOrderApplicationService { if (split.length == 2) { item.put("orderIRow", split[1]); item.put("billIRow", split[1]); + detail.setInLineNumGw(split[1]); } else { item.put("orderIRow", 1); item.put("billIRow", 1); + detail.setInLineNumGw("1"); } } else { item.put("orderIRow", 1); item.put("billIRow", 1); + detail.setInLineNumGw("1"); } } + reservationOutMaterialDetailMapper.updateById(detail); orderList.add(item); } order.put("orderList", orderList); diff --git a/mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml index 734a29625..0c4473956 100644 --- a/mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml @@ -90,6 +90,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + @@ -116,6 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.SPECIFICATION_MODEL, a.SKU_CODE, a.INVOICE_NO, a.LITER, a.DIMENSIONS, a.DECLARATION_UNIT, a.BATCH_REF_NO, a.SHEET_REF_NO, a.ORIGIN_COUNTRY, a.BOX_PALLET_NO, a.CURRENCY, a.UNIT, a.DECLARED_QUANTITY, a.BOX_COUNT, a.PIECE_COUNT, a.INBOUND_QUANTITY, a.TOTAL_NET_WEIGHT, a.TOTAL_GROSS_WEIGHT, a.TOTAL_VOLUME, a.TOTAL_AREA, a.TOTAL_PRICE, + a.line_num_gw, + a.spec_gw, + a.unit_gw, + a.qty_gw, + a.erp_curr_gw, + a.erp_price_gw, + a.amount_gw, + a.in_order_number_gw, + a.in_line_num_gw, a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_1, a.EXT_ATTR_2, a.EXT_ATTR_3, a.EXT_ATTR_4 ,CASE WHEN (a.quantity - a.receipt_quantity) < 0 THEN 0 diff --git a/mhd_oms/src/main/resources/mapper/reservationOutMaterialDetail/ReservationOutMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/reservationOutMaterialDetail/ReservationOutMaterialDetailMapper.xml index 74f4c16ac..f63d86c9e 100644 --- a/mhd_oms/src/main/resources/mapper/reservationOutMaterialDetail/ReservationOutMaterialDetailMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationOutMaterialDetail/ReservationOutMaterialDetailMapper.xml @@ -94,6 +94,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + @@ -145,7 +154,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.INVENTORY_DATE, a.EXT_ATTR_3, a.EXT_ATTR_4, - a.INVENTORY_QUANTITY + a.INVENTORY_QUANTITY, + a.line_num_gw, + a.spec_gw, + a.unit_gw, + a.qty_gw, + a.erp_curr_gw, + a.erp_price_gw, + a.amount_gw, + a.in_order_number_gw, + a.in_line_num_gw diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 68916a079..5dd2d22de 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -28,6 +28,7 @@ import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO; import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail; import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService; import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO; +import com.mhd.wms.domain.pickingMaterialDetail.entity.PickingMaterialDetail; import com.mhd.wms.domain.pickingMaterialDetail.repository.facade.IPickingMaterialDetailService; import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDetailPO; import com.mhd.wms.domain.pickingMaterialDetail.repository.todo.PickingMaterialDetailDO; @@ -833,6 +834,8 @@ public class PickingOrderApplicationService { List> qnBillList = new ArrayList<>(); int gNo = 1; for (OutMaterialDetail detail : outMaterialDetailList) { + PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new LambdaQueryWrapper() + .eq(PickingMaterialDetail::getUniqueId, detail.getUniqueId())); Map item = new HashMap<>(); item.put("etpsPreentNo", detail.getOutOrderNumber() != null ? detail.getOutOrderNumber() : ""); String lotNo = detail.getLotNo(); @@ -840,11 +843,14 @@ public class PickingOrderApplicationService { String[] split = lotNo.split("-"); if (split.length == 2) { item.put("gNo", split[1]); + pickingMaterialDetail.setLineNumGw(split[1]); } else { item.put("gNo", "1"); // 出仓订单行号 + pickingMaterialDetail.setLineNumGw("1"); } } else { item.put("gNo", "1"); // 出仓订单行号 + pickingMaterialDetail.setLineNumGw("1"); } @@ -861,7 +867,12 @@ public class PickingOrderApplicationService { if (unitPrice != null && pickingQty != null && unitPrice.compareTo(BigDecimal.ZERO) != 0) { BigDecimal totalAmt = unitPrice.multiply(pickingQty).setScale(2, BigDecimal.ROUND_HALF_UP); item.put("dclTotalAmt", totalAmt); + pickingMaterialDetail.setAmountGw(totalAmt); } + pickingMaterialDetail.setErpCurrGw(materialInfo.getCurrency() != null ? materialInfo.getCurrency() : ""); +// detail.setSpecGw(materialInfo.getSpecification() != null ? materialInfo.getSpecification() : ""); + pickingMaterialDetail.setErpPriceGw(materialInfo.getUnitPrice()); + pickingMaterialDetail.setQtyGw(pickingQty); } } @@ -878,6 +889,8 @@ public class PickingOrderApplicationService { item.put("orderRow", "1"); // 出仓订单行号 } if (bondInvtNo != null && invtRow != null) { + pickingMaterialDetail.setBondInvtNoGw(bondInvtNo); + pickingMaterialDetail.setInvtRowGw(invtRow.toString()); item.put("bondInvtNo", "BONDINV202603300001"); // 原进口核注清单号 item.put("invtRow", 1); // 原进口核注清单行号 } else { @@ -888,7 +901,9 @@ public class PickingOrderApplicationService { item.put("seatNo", detail.getStorageLocationCode() != null ? detail.getStorageLocationCode() : ""); // 库位 item.put("whNoIn", detail.getWarehouseCode() != null ? detail.getWarehouseCode() : ""); item.put("seatNoIn", detail.getStorageLocationCode() != null ? detail.getStorageLocationCode() : ""); - + pickingMaterialDetail.setWarehouseGw(detail.getWarehouseCode()); + pickingMaterialDetail.setOpWhLocGw(detail.getStorageLocationCode()); + pickingMaterialDetailService.updateById(pickingMaterialDetail); qnBillList.add(item); } order.put("qnBillList", qnBillList); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 16ada8f83..d3a17d834 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -2338,11 +2338,14 @@ public class StockInOrderApplicationService { String[] split = lotNo.split("-"); if (split.length == 2) { gwInDetail.setLineNum(Integer.valueOf(split[1])); + reservationInMaterialDetail.setLineNumGw(split[1]); } else { gwInDetail.setLineNum(index); + reservationInMaterialDetail.setLineNumGw("1"); } } else { gwInDetail.setLineNum(index); + reservationInMaterialDetail.setLineNumGw("1"); } index++; gwInDetail.setItemName(reservationInMaterialDetail.getMaterialName()); @@ -2358,7 +2361,14 @@ public class StockInOrderApplicationService { if (unitPrice != null && quantity != null && unitPrice.compareTo(BigDecimal.ZERO) != 0&&quantity.compareTo(BigDecimal.ZERO) != 0) { BigDecimal Amount = unitPrice.multiply(quantity).setScale(2, BigDecimal.ROUND_HALF_UP); gwInDetail.setAmount(Amount); + reservationInMaterialDetail.setAmountGw(Amount); } + reservationInMaterialDetail.setErpCurrGw(materialBaseInfoPO.getCurrency()); + reservationInMaterialDetail.setErpPriceGw(materialBaseInfoPO.getUnitPrice()); + reservationInMaterialDetail.setSpecGw(materialBaseInfoPO.getSpecificationModel()); + reservationInMaterialDetail.setQtyGw(reservationInMaterialDetail.getQuantity()); + reservationInMaterialDetail.setUnitGw(materialBaseInfoPO.getDeclarationUnit()); + inMaterialDetailService.updateById(reservationInMaterialDetail); orderList.add(gwInDetail); } gwStockInOrder.setOrderList(orderList); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 0fce75534..404b5a648 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -1572,11 +1572,14 @@ public class StockOutOrderApplicationService { String[] split = lotNo.split("-"); if (split.length == 2) { item.put("lineNum", split[1]); + detail.setLineNumGw(split[1]); } else { item.put("lineNum", index); + detail.setLineNumGw(String.valueOf(index)); } } else { item.put("lineNum", index); + detail.setLineNumGw(String.valueOf(index)); } item.put("itemNo", detail.getMaterialCode() != null ? detail.getMaterialCode().toString() : ""); item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : ""); @@ -1596,7 +1599,13 @@ public class StockOutOrderApplicationService { if (unitPrice != null && quantity != null && unitPrice.compareTo(BigDecimal.ZERO) != 0 && quantity.compareTo(BigDecimal.ZERO) != 0) { BigDecimal amount = unitPrice.multiply(quantity).setScale(2, BigDecimal.ROUND_HALF_UP); item.put("amount", amount); + detail.setAmountGw(amount); } + detail.setErpCurrGw(materialBaseInfoPO.getCurrency()); + detail.setErpPriceGw(materialBaseInfoPO.getUnitPrice()); + detail.setSpecGw(materialBaseInfoPO.getSpecificationModel()); + detail.setUnitGw(materialBaseInfoPO.getDeclarationUnit()); + detail.setQtyGw(detail.getQuantity()); } } @@ -1610,12 +1619,15 @@ public class StockOutOrderApplicationService { String inLotNo = materialInventory.getLotNumber(); if (inOrderNumber != null) { item.put("orderINo", inOrderNumber); + detail.setInOrderNumberGw(inOrderNumber); } if (warehouseCode != null) { item.put("warehouse", warehouseCode); + detail.setWarehouseGw(warehouseCode); } if (storageLocationCode != null) { item.put("opWhLoc", storageLocationCode); + detail.setOpWhLocGw(storageLocationCode); } // billI = 入库单号 if (inOrderNumber != null) { @@ -1626,15 +1638,19 @@ public class StockOutOrderApplicationService { if (split.length == 2) { item.put("orderIRow", split[1]); item.put("billIRow", split[1]); + detail.setInLineNumGw(split[1]); } else { item.put("orderIRow", index); item.put("billIRow", index); + detail.setInLineNumGw(String.valueOf(index)); } } else { item.put("orderIRow", index); item.put("billIRow", index); + detail.setInLineNumGw(String.valueOf(index)); } } + outMaterialDetailService.updateById(detail); orderList.add(item); index++; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index f9e545f42..1a5c35b58 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -2755,6 +2755,7 @@ public class StockShelfOrderApplicationService { List> detailItems = new ArrayList<>(); int index = 1; for (ShelfMaterialDetailPO shelfMaterialDetail : shelfMaterialDetails) { + ShelfMaterialDetail detail = shelfMaterialDetailService.getById(shelfMaterialDetail.getMaterialDetailId()); Map detailItem = new HashMap<>(); //入库单号 @@ -2765,11 +2766,14 @@ public class StockShelfOrderApplicationService { String[] split = lotNumber.split("-"); if (split.length == 2) { detailItem.put("gNo", split[1]); + detail.setLineNumGw(split[1]); } else { detailItem.put("gNo", index++); + detail.setLineNumGw(String.valueOf(index++)); } } else { detailItem.put("gNo", index++); + detail.setLineNumGw(String.valueOf(index++)); } MaterialBaseInfo materialBaseIn = materialBaseInfoMapper.selectById(materialBaseInfoId); if (materialBaseIn != null) { @@ -2783,6 +2787,7 @@ public class StockShelfOrderApplicationService { BigDecimal totalAmount = shelvesQuantity.multiply(materialBaseIn.getUnitPrice()); //申报总价 detailItem.put("dclTotalAmt", totalAmount); + detail.setAmountGw(totalAmount); } //申报数量 detailItem.put("dclQty", shelvesQuantity); @@ -2790,7 +2795,11 @@ public class StockShelfOrderApplicationService { com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail inMaterialDetail = inMaterialDetailService.getOne(new LambdaQueryWrapper().eq(com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail::getMaterialBaseInfoId, materialBaseIn.getMaterialBaseInfoId()).eq(com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail::getInOrderNumber, stockShelfOrder.getInOrderNumber())); detailItem.put("dclCurrcd", materialBaseIn.getCurrency()); } - + detail.setQtyGw(shelvesQuantity); + detail.setUnitGw(materialBaseIn.getDeclarationUnit()); + detail.setErpCurrGw(materialBaseIn.getCurrency()); + detail.setUnitGw(materialBaseIn.getDeclarationUnit()); + detail.setSpecGw(materialBaseIn.getSpecificationModel()); } //入仓订单号 detailItem.put("orderNo", stockShelfOrder.getInOrderNumber()); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java index e60f886cd..dbd947f6c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/entity/InMaterialDetail.java @@ -398,4 +398,20 @@ public class InMaterialDetail extends BaseVOEntity { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date drinkDate; + + + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java index 240f20d7f..b87fa3073 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java @@ -423,4 +423,19 @@ public class InMaterialDetailPO extends StockInOrderBasePO { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date drinkDate; + + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java index 328d3fd79..13f27b4b4 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/todo/InMaterialDetailDO.java @@ -389,4 +389,19 @@ public class InMaterialDetailDO extends StockInOrderBaseDO { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date drinkDate; + + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java index 2f3c3b558..1a5115a0f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java @@ -506,4 +506,26 @@ public class OutMaterialDetail extends BaseVOEntity { @ApiModelProperty("抄码总重量") @Excel(name = "抄码总重量") private BigDecimal copyTotalWeight; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; + private String invtRowGw; + private String bondInvtNoGw; + private String whNoGw; + private String seatNoGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java index e0ed28f67..5d61eee52 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java @@ -545,4 +545,26 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO { @ApiModelProperty("重量列表（抄码商品使用）") private List weightList; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; + private String invtRowGw; + private String bondInvtNoGw; + private String whNoGw; + private String seatNoGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java index a86d4a466..1dd1cc9aa 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/todo/OutMaterialDetailDO.java @@ -498,4 +498,26 @@ public class OutMaterialDetailDO extends BaseVOEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date productionDate; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; + private String invtRowGw; + private String bondInvtNoGw; + private String whNoGw; + private String seatNoGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java index 7c00a6e67..667c63419 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java @@ -299,4 +299,26 @@ public class PickingMaterialDetail extends BaseVOEntity { @ApiModelProperty("入库单号") @Excel(name = "入库单号") private String inOrderNumber; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; + private String invtRowGw; + private String bondInvtNoGw; + private String whNoGw; + private String seatNoGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java index 0e7bb2023..f82194b3c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/po/PickingMaterialDetailPO.java @@ -323,5 +323,26 @@ public class PickingMaterialDetailPO extends BaseVOEntity { @ApiModelProperty("LOT编码2") private String lotNo; - + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; + private String invtRowGw; + private String bondInvtNoGw; + private String whNoGw; + private String seatNoGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java index 77307639c..5ee5240a2 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/todo/PickingMaterialDetailDO.java @@ -306,4 +306,26 @@ public class PickingMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("入库单号") @Excel(name = "入库单号") private String inOrderNumber; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; + private String invtRowGw; + private String bondInvtNoGw; + private String whNoGw; + private String seatNoGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java index 19097c803..d48ea1e8e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java @@ -377,4 +377,18 @@ public class ShelfMaterialDetail extends BaseVOEntity { @ApiModelProperty("批次号") @Excel(name = "批次号") private String batchNo; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java index 981ecdeac..316595d5a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/po/ShelfMaterialDetailPO.java @@ -391,4 +391,18 @@ public class ShelfMaterialDetailPO extends BaseVOEntity { @ApiModelProperty("单价") @Excel(name = "单价") private BigDecimal unitPrice; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java index cf0e81897..95068a344 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/repository/todo/ShelfMaterialDetailDO.java @@ -370,4 +370,18 @@ public class ShelfMaterialDetailDO extends BaseVOEntity { @ApiModelProperty("批次号") @Excel(name = "批次号") private String batchNo; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java index 0518b1f93..a87ebdf82 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/inMaterialDetail/InMaterialDetailDTO.java @@ -387,4 +387,18 @@ public class InMaterialDetailDTO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date drinkDate; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java index b9d22b38c..0fa14e65e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/outMaterialDetail/OutMaterialDetailDTO.java @@ -484,5 +484,26 @@ public class OutMaterialDetailDTO extends BaseVOEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date productionDate; - + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; + private String invtRowGw; + private String bondInvtNoGw; + private String whNoGw; + private String seatNoGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingMaterialDetail/PickingMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingMaterialDetail/PickingMaterialDetailDTO.java index 2024152f0..657bd619c 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingMaterialDetail/PickingMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingMaterialDetail/PickingMaterialDetailDTO.java @@ -253,4 +253,26 @@ public class PickingMaterialDetailDTO extends BaseVOEntity { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "生产日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date productionDate; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; + private String inOrderNumberGw; + private String inLineNumGw; + private String opWhLocGw; + private String warehouseGw; + private String invtRowGw; + private String bondInvtNoGw; + private String whNoGw; + private String seatNoGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java index 295b76f41..0518516cb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/shelfMaterialDetail/ShelfMaterialDetailDTO.java @@ -353,4 +353,18 @@ public class ShelfMaterialDetailDTO extends BaseVOEntity { @ApiModelProperty("批次号") @Excel(name = "批次号") private String batchNo; + //订单行号 + private String lineNumGw; + //物料规格 + private String specGw; + //计量单位 + private String unitGw; + //数量 + private BigDecimal qtyGw; + //企业币制 + private String erpCurrGw; + //企业单价 + private BigDecimal erpPriceGw; + //申报总价 + private BigDecimal amountGw; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml index 8d298c27a..c614da81d 100644 --- a/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/OutMaterialDetail/OutMaterialDetailMapper.xml @@ -96,6 +96,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + @@ -149,7 +157,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.EXT_ATTR_4, a.COPY_TOTAL_WEIGHT, a.COPY_CODE_REFERENCE_IDS, - a.INVENTORY_QUANTITY + a.INVENTORY_QUANTITY, + a.line_num_gw, + a.spec_gw, + a.unit_gw, + a.qty_gw, + a.erp_curr_gw, + a.erp_price_gw, + a.amount_gw, + a.in_order_number_gw, + a.in_line_num_gw diff --git a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml index bb0ce7cb0..6cefc6155 100644 --- a/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/inMaterialDetail/InMaterialDetailMapper.xml @@ -89,6 +89,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + @@ -115,6 +122,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.SPECIFICATION_MODEL, a.SKU_CODE, a.INVOICE_NO, a.LITER, a.DIMENSIONS, a.DECLARATION_UNIT, a.BATCH_REF_NO, a.SHEET_REF_NO, a.ORIGIN_COUNTRY, a.BOX_PALLET_NO, a.CURRENCY, a.UNIT, a.DECLARED_QUANTITY, a.BOX_COUNT, a.PIECE_COUNT, a.INBOUND_QUANTITY, a.TOTAL_NET_WEIGHT, a.TOTAL_GROSS_WEIGHT, a.TOTAL_VOLUME, a.TOTAL_AREA, a.TOTAL_PRICE, + a.line_num_gw, + a.spec_gw, + a.unit_gw, + a.qty_gw, + a.erp_curr_gw, + a.erp_price_gw, + a.amount_gw, + a.in_order_number_gw, + a.in_line_num_gw, a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE, a.EXT_ATTR_1, a.EXT_ATTR_2, a.EXT_ATTR_3, a.EXT_ATTR_4,a.DRINK_DATE, a.OMS_IN_MATERIAL_DETAIL ,CASE diff --git a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml index 11bcd9ca1..883671619 100644 --- a/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingMaterialDetail/PickingMaterialDetailMapper.xml @@ -66,6 +66,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + + + + + + + + + @@ -84,7 +99,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.COPY_CODE_REFERENCE_IDS, a.picked_copy_code_reference_ids, omd.in_order_number, omd.lot_no as lot_number, - a.lot_No,a.in_order_number + a.lot_No,a.in_order_number, + a.line_num_gw, + a.spec_gw, + a.unit_gw, + a.qty_gw, + a.erp_curr_gw, + a.erp_price_gw, + a.amount_gw, + a.in_order_number_gw, + a.in_line_num_gw, + a.op_wh_loc_gw, + a.warehouse_gw, + a.invt_row_gw, + a.bond_invt_no_gw, + a.wh_no_gw, + a.seat_no_gw diff --git a/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml b/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml index e641df613..a4c0cdc5d 100644 --- a/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml +++ b/mhd_wms/src/main/resources/mapper/shelfMaterialDetail/ShelfMaterialDetailMapper.xml @@ -77,6 +77,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + @@ -85,7 +92,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" CASE WHEN pack_detail_id IS NULL OR TRIM(pack_detail_id) = '' THEN NULL ELSE CAST(pack_detail_id AS BIGINT) - END as pack_detail_id, unit_code, unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area,in_order_number,lot_number,pallet_number,copy_batch,copy_quantity,copy_details from shelf_material_detail + END as pack_detail_id, unit_code, + line_num_gw, + spec_gw, + unit_gw, + qty_gw, + erp_curr_gw, + erp_price_gw, + amount_gw, + in_order_number_gw, + in_line_num_gw, + unit_name, unit_number, material_warehouse_control_id, serial_number_manage, quality_inspection_manage, quality_inspection_stage, quality_inspection_rule, quality_inspection_ratio, quality_inspection_term, quality_inspection_results, allow_overcharge, overcharge_ratio, batch_number, material_status_code, material_status_name, distribute_rule_id, distribute_rule_code, distribute_rule_name, container_id, container_code, container_type, container_type_name, warehouse_id, warehouse_code, warehouse_name, storage_section_id, storage_code, storage_name, storage_location_id, storage_location_code, storage_location_name, level, parent_unique_id, in_unique_id, receipt_unique_id, allow_modify, remark, batch_ref_no, sheet_ref_no, box_pallet_no, ext_attr_1, ext_attr_2, production_date, expiry_date, inventory_date, ext_attr_3, ext_attr_4, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag,total_net_weight,total_gross_weight,total_volume,total_area,in_order_number,lot_number,pallet_number,copy_batch,copy_quantity,copy_details from shelf_material_detail From 6aeabc7be7c02f080020a7c9e04b7ea1351f6adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 16:45:16 +0800 Subject: [PATCH 15/37] =?UTF-8?q?=E6=8B=A3=E8=B4=A7=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/pickingOrder/PickingOrderApplicationService.java | 2 +- .../stockShelfOrder/StockShelfOrderApplicationService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 5dd2d22de..9412c56f8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -835,7 +835,7 @@ public class PickingOrderApplicationService { int gNo = 1; for (OutMaterialDetail detail : outMaterialDetailList) { PickingMaterialDetail pickingMaterialDetail = pickingMaterialDetailService.getOne(new LambdaQueryWrapper() - .eq(PickingMaterialDetail::getUniqueId, detail.getUniqueId())); + .eq(PickingMaterialDetail::getOutUniqueId, detail.getUniqueId())); Map item = new HashMap<>(); item.put("etpsPreentNo", detail.getOutOrderNumber() != null ? detail.getOutOrderNumber() : ""); String lotNo = detail.getLotNo(); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 1a5c35b58..33ee9a434 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -2823,6 +2823,7 @@ public class StockShelfOrderApplicationService { //库位 detailItem.put("seatNo", shelfMaterialDetail.getStorageLocationCode()); detailItems.add(detailItem); + shelfMaterialDetailService.updateById(detail); // Fixed method call } item.put("qnBillList", detailItems); List> bodyList = new ArrayList<>(); From bc3bdd669e1816d0db4fa915ab4a30757b22c5ab Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 16:52:40 +0800 Subject: [PATCH 16/37] =?UTF-8?q?=E4=B8=80=E8=88=AC=E8=B4=B8=E6=98=93?= =?UTF-8?q?=E6=8E=A8=E9=80=81=EF=BC=8C=E4=BF=9D=E5=AD=98=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sinessDocumentOrderApplicationService.java | 36 +++++++++ .../entity/DocumentPushMaterialRecord.java | 77 +++++++++++++++++++ .../DocumentPushMaterialRecordMapper.java | 9 +++ .../DocumentPushMaterialRecordMapper.xml | 29 +++++++ 4 files changed, 151 insertions(+) create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/repository/mapper/DocumentPushMaterialRecordMapper.java create mode 100644 mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index d74bff3cc..6155328f3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -23,6 +23,8 @@ import com.mhd.oms.domain.executeOrder.entity.ExecuteOrder; import com.mhd.oms.domain.executeOrder.repository.mapper.ExecuteOrderMapper; import com.mhd.oms.domain.gwLog.entity.GwLog; import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper; +import com.mhd.oms.domain.documentPushMaterialRecord.entity.DocumentPushMaterialRecord; +import com.mhd.oms.domain.documentPushMaterialRecord.repository.mapper.DocumentPushMaterialRecordMapper; import com.mhd.oms.interfaces.dto.businessDocumentAddressMulti.BusinessAuditDTO; import com.mhd.oms.interfaces.dto.businessDocumentOrder.BusinessDocumentOrderDTO; import com.mhd.system.api.model.LoginUser; @@ -88,6 +90,9 @@ public class BusinessDocumentOrderApplicationService { @Resource private ExecuteOrderMapper executeOrderMapper; + @Resource + private DocumentPushMaterialRecordMapper documentPushMaterialRecordMapper; + /** * 分页查询【请填写功能名称】列表 */ @@ -328,6 +333,37 @@ public class BusinessDocumentOrderApplicationService { if (dataCode != null && dataCode == 200) { gwLog.setStatus(2); updatePushStatus(order.getId(), 3, new Date(), String.valueOf(pushBy), pushByName); + // 推送成功，保存单证推送物料快照 + try { + Date now = new Date(); + for (BusinessDocumentCargoMulti cargo : cargoList) { + DocumentPushMaterialRecord docRecord = new DocumentPushMaterialRecord(); + docRecord.setOrderId(order.getId()); + docRecord.setMaterialBaseInfoId(cargo.getMaterialBaseInfoId()); + if (cargo.getMaterialBaseInfoId() != null) { + MaterialBaseInfoPO material = reservationStockInOrderMapper.getinfo(cargo.getMaterialBaseInfoId()); + if (material != null) { + docRecord.setMaterialCode(material.getMaterialCode()); + docRecord.setMaterialName(material.getMaterialName()); + docRecord.setGoodsType(material.getGoodsType()); + docRecord.setSpecificationModel(material.getSpecificationModel()); + docRecord.setDeclarationUnit(material.getDeclarationUnit()); + docRecord.setCurrency(material.getCurrency()); + docRecord.setUnitPrice(material.getUnitPrice()); + docRecord.setNetWeight(material.getWeightLimit()); + docRecord.setGrossWeight(material.getGrossWeight()); + } + } + docRecord.setPushTime(now); + docRecord.setDelFlag(1); + docRecord.setCreateBy(String.valueOf(pushBy)); + docRecord.setCreateTime(now); + docRecord.setUpdateTime(now); + documentPushMaterialRecordMapper.insert(docRecord); + } + } catch (Exception e) { + log.error("保存单证推送物料快照失败: orderId={}", order.getId(), e); + } successCount++; } else { gwLog.setStatus(3); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java b/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java new file mode 100644 index 000000000..3d1052082 --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java @@ -0,0 +1,77 @@ +package com.mhd.oms.domain.documentPushMaterialRecord.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(value = "单证推送物料记录对象") +@TableName("document_push_material_record") +public class DocumentPushMaterialRecord implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("主键") + @TableId(type = IdType.AUTO) + private Long id; + + @ApiModelProperty("单证ID") + private Long orderId; + + @ApiModelProperty("物料ID") + private Long materialBaseInfoId; + + @ApiModelProperty("物料编码") + private String materialCode; + + @ApiModelProperty("物料名称") + private String materialName; + + @ApiModelProperty("规格型号") + private String specificationModel; + + @ApiModelProperty("申报单位") + private String declarationUnit; + + @ApiModelProperty("数量") + private BigDecimal cargoNum; + + @ApiModelProperty("币制") + private String currency; + + @ApiModelProperty("单价") + private BigDecimal unitPrice; + + @ApiModelProperty("净重(kg)") + private BigDecimal netWeight; + + @ApiModelProperty("毛重(kg)") + private BigDecimal grossWeight; + + @ApiModelProperty("商品类型(0物料，1半成品，2成品)") + private Integer goodsType; + + @ApiModelProperty("推送时间") + private Date pushTime; + + @ApiModelProperty("删除标志(1-正常，2-删除)") + private Integer delFlag; + + @ApiModelProperty("创建人") + private String createBy; + + @ApiModelProperty("创建时间") + private Date createTime; + + @ApiModelProperty("更新人") + private String updateBy; + + @ApiModelProperty("更新时间") + private Date updateTime; +} diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/repository/mapper/DocumentPushMaterialRecordMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/repository/mapper/DocumentPushMaterialRecordMapper.java new file mode 100644 index 000000000..0200ad48a --- /dev/null +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/repository/mapper/DocumentPushMaterialRecordMapper.java @@ -0,0 +1,9 @@ +package com.mhd.oms.domain.documentPushMaterialRecord.repository.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.mhd.oms.domain.documentPushMaterialRecord.entity.DocumentPushMaterialRecord; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface DocumentPushMaterialRecordMapper extends BaseMapper { +} diff --git a/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml b/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml new file mode 100644 index 000000000..32f4dd43f --- /dev/null +++ b/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From 186d76f9fcc117d26919213d037096914207b1bd Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 17:12:19 +0800 Subject: [PATCH 17/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E8=88=AC?= =?UTF-8?q?=E8=B4=B8=E6=98=93=E7=9A=84=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/MaterialPushRecordService.java | 76 ++++++++++++++----- .../MaterialPushRecordApi.java | 7 +- 2 files changed, 60 insertions(+), 23 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java index 84d1036ba..94999e8c1 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/service/MaterialPushRecordService.java @@ -4,14 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.oms.domain.materialPushRecord.entity.MaterialPushRecord; import com.mhd.oms.domain.materialPushRecord.repository.mapper.MaterialPushRecordMapper; +import com.mhd.oms.domain.documentPushMaterialRecord.entity.DocumentPushMaterialRecord; +import com.mhd.oms.domain.documentPushMaterialRecord.repository.mapper.DocumentPushMaterialRecordMapper; import com.mhd.system.api.WmsServiceFeign; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; @Service @@ -24,11 +24,14 @@ public class MaterialPushRecordService { @Resource private WmsServiceFeign wmsServiceFeign; + @Resource + private DocumentPushMaterialRecordMapper documentPushMaterialRecordMapper; + /** * 按物料ID列表查询物料数据 - * 优先查物料推送快照，没有则调WMS查实时数据 + * 先按orderId查单证推送快照，没有再查物料推送快照，最后调WMS */ - public TableDataInfo getBatchByIds(List materialBaseInfoIds) { + public TableDataInfo getBatchByIds(List materialBaseInfoIds, Long orderId) { if (materialBaseInfoIds == null || materialBaseInfoIds.isEmpty()) { TableDataInfo emptyResult = new TableDataInfo(); emptyResult.setData(new ArrayList<>()); @@ -37,28 +40,61 @@ public class MaterialPushRecordService { return emptyResult; } - // 1. 先查物料推送记录表 - List pushRecords = materialPushRecordMapper.selectList( - new LambdaQueryWrapper() - .in(MaterialPushRecord::getMaterialBaseInfoId, materialBaseInfoIds) - .eq(MaterialPushRecord::getDelFlag, 1)); - - if (pushRecords != null && !pushRecords.isEmpty()) { + // 1. 先按orderId查单证推送物料记录表 + List docRecords = documentPushMaterialRecordMapper.selectList( + new LambdaQueryWrapper() + .eq(DocumentPushMaterialRecord::getOrderId, orderId) + .eq(DocumentPushMaterialRecord::getDelFlag, 1)); + if (docRecords != null && !docRecords.isEmpty()) { + // 有单证推送数据，按物料ID去重取最新一条，并检查是否覆盖所有请求的物料ID + Map latestMap = new HashMap<>(); + for (DocumentPushMaterialRecord r : docRecords) { + Long mid = r.getMaterialBaseInfoId(); + if (mid == null) continue; + DocumentPushMaterialRecord old = latestMap.get(mid); + if (old == null || (r.getPushTime() != null && old.getPushTime() == null) + || (r.getPushTime() != null && old.getPushTime() != null && r.getPushTime().after(old.getPushTime()))) { + latestMap.put(mid, r); + } + } // 检查是否所有请求的物料ID都查到了 - Set foundIds = pushRecords.stream() - .map(MaterialPushRecord::getMaterialBaseInfoId) - .collect(Collectors.toSet()); - if (foundIds.containsAll(materialBaseInfoIds)) { - // 全部ID都有推送快照，直接返回 + if (latestMap.keySet().containsAll(materialBaseInfoIds)) { + List resultList = new ArrayList<>(latestMap.values()); TableDataInfo result = new TableDataInfo(); - result.setData(pushRecords); - result.setTotal(pushRecords.size()); + result.setData(resultList); + result.setTotal(resultList.size()); result.setCode(200); return result; } } - // 2. 有物料没有推送数据，调WMS查全部实时数据 + // 2. 查物料推送记录表 + List pushRecords = materialPushRecordMapper.selectList( + new LambdaQueryWrapper() + .in(MaterialPushRecord::getMaterialBaseInfoId, materialBaseInfoIds) + .eq(MaterialPushRecord::getDelFlag, 1)); + if (pushRecords != null && !pushRecords.isEmpty()) { + // 按物料ID去重取最新一条 + Map latestMap = new HashMap<>(); + for (MaterialPushRecord r : pushRecords) { + Long mid = r.getMaterialBaseInfoId(); + if (mid == null) continue; + MaterialPushRecord old = latestMap.get(mid); + if (old == null || (r.getPushTime() != null && old.getPushTime() == null) + || (r.getPushTime() != null && old.getPushTime() != null && r.getPushTime().after(old.getPushTime()))) { + latestMap.put(mid, r); + } + } + if (latestMap.keySet().containsAll(materialBaseInfoIds)) { + TableDataInfo result = new TableDataInfo(); + result.setData(new ArrayList<>(latestMap.values())); + result.setTotal(latestMap.size()); + result.setCode(200); + return result; + } + } + + // 3. 都没有全命中，调WMS查全部实时数据 try { return wmsServiceFeign.getBatchByIds(materialBaseInfoIds); } catch (Exception e) { diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java index e2448e49f..2d034c3de 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/materialPushRecord/MaterialPushRecordApi.java @@ -17,9 +17,10 @@ public class MaterialPushRecordApi { @Resource private MaterialPushRecordService materialPushRecordService; - @ApiOperation("批量查询物料推送数据（优先查推送快照，没有则调WMS查实时数据）") + @ApiOperation("批量查询物料推送数据（先按orderId查单证推送快照，再按物料id查推送快照，最后调WMS）") @GetMapping("/getBatchByIds") - public AjaxResult getBatchByIds(@RequestParam("materialBaseInfoIds") List materialBaseInfoIds) { - return AjaxResult.success(materialPushRecordService.getBatchByIds(materialBaseInfoIds)); + public AjaxResult getBatchByIds(@RequestParam("materialBaseInfoIds") List materialBaseInfoIds, + @RequestParam("orderId") Long orderId) { + return AjaxResult.success(materialPushRecordService.getBatchByIds(materialBaseInfoIds, orderId)); } } From 95c128b5062656930ce3940c05fbbcf9f042e945 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 17:32:14 +0800 Subject: [PATCH 18/37] sql --- sql/oms20260513.sql | 47 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/sql/oms20260513.sql b/sql/oms20260513.sql index b39d5526b..20bec1855 100644 --- a/sql/oms20260513.sql +++ b/sql/oms20260513.sql @@ -218,4 +218,49 @@ COMMENT ON TABLE NGWL_TEST_OMS.MATERIAL_PUSH_RECORD IS '物料推送记录表'; COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.CREATE_BY IS '创建人'; COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.CREATE_TIME IS '创建时间'; COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.UPDATE_BY IS '更新人'; - COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.UPDATE_TIME IS '更新时间'; \ No newline at end of file + COMMENT ON COLUMN NGWL_TEST_OMS.MATERIAL_PUSH_RECORD.UPDATE_TIME IS '更新时间'; + + + +CREATE TABLE NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD ( + ID BIGINT IDENTITY(1,1) NOT NULL, + ORDER_ID BIGINT, + MATERIAL_BASE_INFO_ID BIGINT, + MATERIAL_CODE VARCHAR(100), + MATERIAL_NAME VARCHAR(255), + SPECIFICATION_MODEL VARCHAR(255), + DECLARATION_UNIT VARCHAR(100), + CARGO_NUM DECIMAL(20,4), + CURRENCY VARCHAR(10), + UNIT_PRICE DECIMAL(20,4), + NET_WEIGHT DECIMAL(20,4), + GROSS_WEIGHT DECIMAL(20,4), + GOODS_TYPE INT, + PUSH_TIME DATETIME, + DEL_FLAG INT DEFAULT 1, + CREATE_BY VARCHAR(100), + CREATE_TIME DATETIME, + UPDATE_BY VARCHAR(100), + UPDATE_TIME DATETIME, + PRIMARY KEY (ID) +); + +COMMENT ON TABLE NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD IS '单证推送物料记录表'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.ORDER_ID IS '单证ID'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.MATERIAL_BASE_INFO_ID IS '物料ID'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.MATERIAL_CODE IS '物料编码'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.MATERIAL_NAME IS '物料名称'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.SPECIFICATION_MODEL IS '规格型号'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.DECLARATION_UNIT IS '申报单位'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.CARGO_NUM IS '数量'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.CURRENCY IS '币制'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.UNIT_PRICE IS '单价'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.NET_WEIGHT IS '净重(kg)'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.GROSS_WEIGHT IS '毛重(kg)'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.GOODS_TYPE IS '商品类型(0物料，1半成品，2成品)'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.PUSH_TIME IS '推送时间'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.DEL_FLAG IS '删除标志(1-正常，2-删除)'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.CREATE_BY IS '创建人'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.CREATE_TIME IS '创建时间'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.UPDATE_BY IS '更新人'; + COMMENT ON COLUMN NGWL_TEST_OMS.DOCUMENT_PUSH_MATERIAL_RECORD.UPDATE_TIME IS '更新时间'; \ No newline at end of file From caac89e3db2e311faef4ae0432306c5f999800cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 17:51:44 +0800 Subject: [PATCH 19/37] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E9=94=99;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java index d48ea1e8e..7f01532c9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java @@ -320,7 +320,8 @@ public class ShelfMaterialDetail extends BaseVOEntity { private BigDecimal totalNetWeight; @ApiModelProperty("累计已上架净重(KG)，与 totalNetWeight 同口径累加本次净重") - @TableField("total_net_weight") +// update会报错注释 +// @TableField("total_net_weight") private BigDecimal alreadyShelvesNetWeight; @ApiModelProperty("总毛重(KG)") From 0ad41cd7684a9451c94e5b009c1b84f2497d43e0 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 18:08:18 +0800 Subject: [PATCH 20/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E7=94=B3=E8=AF=B7=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessDocumentOrderApplicationService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index 6155328f3..371830eb0 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -437,7 +437,7 @@ public class BusinessDocumentOrderApplicationService { // 构建单个对象 Map item = new HashMap<>(); - item.put("erpBillNo", String.valueOf(businessDocumentOrderDTO.getId())); + item.put("erpBillNo", businessDocumentOrderDTO.getGoodsNumber()); item.put("operateType", String.valueOf(businessDocumentOrderDTO.getReviseApplyType())); item.put("appMan", businessDocumentOrderDTO.getReviseApplyBy()); item.put("appMess", businessDocumentOrderDTO.getReviseApplyReason()); From e84adc2d6fa871c5dc88dcc8d6da2004aca39eac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 18:11:16 +0800 Subject: [PATCH 21/37] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8A=A8=E6=80=81url=E5=9C=B0=E5=9D=80;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ReservationStockInOrderMapper.java | 2 ++ ...rvationStockInOrderApplicationService.java | 11 +++++++-- ...vationStockOutOrderApplicationService.java | 11 +++++++-- .../ReservationStockInOrderMapper.xml | 8 ++++++- .../PickingOrderApplicationService.java | 23 ++++++++++++++++--- .../StockInOrderApplicationService.java | 14 +++++++++-- .../StockOutOrderApplicationService.java | 13 +++++++++-- .../StockShelfOrderApplicationService.java | 22 +++++++++++++++--- .../mapper/PickingMaterialDetailMapper.java | 2 ++ .../PickingMaterialDetailMapper.xml | 8 +++++++ 10 files changed, 99 insertions(+), 15 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java index 2fbb11196..a6196e0d2 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java @@ -55,4 +55,6 @@ public interface ReservationStockInOrderMapper extends BaseMapper select CUSTOMER_NC_CODE from "NGWL_TEST_USER".USER_SHIPPER where 1 = 1 and DEL_FLAG = 1 and USER_ID = #{id} - + \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 9412c56f8..31c6b49b5 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -30,6 +30,7 @@ import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailSe import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO; import com.mhd.wms.domain.pickingMaterialDetail.entity.PickingMaterialDetail; import com.mhd.wms.domain.pickingMaterialDetail.repository.facade.IPickingMaterialDetailService; +import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper; import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDetailPO; import com.mhd.wms.domain.pickingMaterialDetail.repository.todo.PickingMaterialDetailDO; import com.mhd.wms.domain.pickingMaterialDetail.service.PickingMaterialDetailDomainService; @@ -98,6 +99,8 @@ public class PickingOrderApplicationService { private IInMaterialDetailService inMaterialDetailService; @Autowired private ICustomsDeclarationDetailService customsDeclarationDetailService; + @Autowired + private PickingMaterialDetailMapper pickingMaterialDetailMapper; private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_qnBill_e"; @@ -728,6 +731,7 @@ public class PickingOrderApplicationService { public AjaxResult batchPush(List idList) { + if (idList == null || idList.isEmpty()) { return AjaxResult.error("没有数据需要推送"); } @@ -738,7 +742,7 @@ public class PickingOrderApplicationService { Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; - + String ncUrl = pickingMaterialDetailMapper.getNcUrl("gw", organizationName, organizationId); int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); @@ -779,7 +783,13 @@ public class PickingOrderApplicationService { customsBodyList.add(customsParam); CloseableHttpClient customsHttpClient = HttpClients.createDefault(); - HttpPost customsHttpPost = new HttpPost(PUSH_API_URL); + String url = ""; + if (ncUrl != null) { + url = ncUrl; + } else { + url = PUSH_API_URL; + } + HttpPost customsHttpPost = new HttpPost(url); StringEntity customsPostingString = new StringEntity(JSONObject.toJSONString(customsBodyList), "UTF-8"); customsHttpPost.setEntity(customsPostingString); customsHttpPost.setHeader("Content-type", "application/json"); @@ -943,7 +953,14 @@ public class PickingOrderApplicationService { updatePushStatus(id, 2, new Date(), pushBy,pushByName); CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost(PUSH_API_URL); + String url = ""; + if (ncUrl != null) { + url = ncUrl; + } else { + url = PUSH_API_URL; + } +// HttpPost customsHttpPost = new HttpPost(url); + HttpPost httpPost = new HttpPost(url); StringEntity postingString = new StringEntity(com.alibaba.fastjson.JSONObject.toJSONString(bodyList), "UTF-8"); httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index d3a17d834..87de6a8e1 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -37,6 +37,7 @@ import com.mhd.wms.domain.materialBaseInfo.entity.MaterialBaseInfo; import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService; import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO; import com.mhd.wms.domain.materialBaseInfo.repository.todo.MaterialBaseInfoDO; +import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper; import com.mhd.wms.domain.receiptOrderAccount.entity.ReceiptOrderAccount; import com.mhd.wms.domain.receiptOrderAccount.repository.facade.IReceiptOrderAccountService; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; @@ -113,6 +114,8 @@ public class StockInOrderApplicationService { private IInMaterialDetailService inMaterialDetailService; @Autowired private StockOutOrderMapper stockOutOrderMapper; + @Autowired + private PickingMaterialDetailMapper pickingMaterialDetailMapper; private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_i"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; @@ -2402,9 +2405,16 @@ public class StockInOrderApplicationService { } updatePushStatus(id, 2, new Date(), pushBy,pushByName); - + String ncUrl = pickingMaterialDetailMapper.getNcUrl("gw", organizationName, organizationId); CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost(PUSH_API_URL); + String url = ""; + if (ncUrl != null) { + url = ncUrl; + } else { + url = PUSH_API_URL; + } +// HttpPost customsHttpPost = new HttpPost(url); + HttpPost httpPost = new HttpPost(url); StringEntity postingString = new StringEntity(com.alibaba.fastjson.JSONObject.toJSONString(gwStockInOrderList), "UTF-8"); httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 404b5a648..621dc29cc 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -44,6 +44,7 @@ import com.mhd.wms.domain.outMaterialDetail.repository.po.OutStockListMaterialAg import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO; import com.mhd.wms.domain.outMaterialDetail.service.OutMaterialDetailDomainService; import com.mhd.wms.domain.pickingMaterialDetail.repository.facade.IPickingMaterialDetailService; +import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper; import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingAggByOutOrderRow; import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDetailPO; import com.mhd.wms.domain.stockInOrder.entity.StockInOrder; @@ -115,6 +116,8 @@ public class StockOutOrderApplicationService { private IMaterialBaseInfoService materialBaseInfoService; @Autowired private StockOutOrderMapper stockOutOrderMapper; + @Autowired + private PickingMaterialDetailMapper pickingMaterialDetailMapper; private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_e"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; @@ -1685,9 +1688,15 @@ public class StockOutOrderApplicationService { log.error("保存Gwlog失败：{}",e.getMessage()); } updatePushStatus(id, 2, new Date(), pushBy,pushByName); - + String ncUrl = pickingMaterialDetailMapper.getNcUrl("gw", organizationName, organizationId); CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost(PUSH_API_URL); + String url = ""; + if (ncUrl != null) { + url = ncUrl; + } else { + url = PUSH_API_URL; + } + HttpPost httpPost = new HttpPost(url); StringEntity postingString = new StringEntity(com.alibaba.fastjson.JSONObject.toJSONString(bodyList), "UTF-8"); httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 33ee9a434..1f53550b6 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -24,6 +24,7 @@ import com.mhd.system.api.domain.cache.SystemServiceCacheUtil; import com.mhd.system.api.model.LoginUser; import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService; import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord; +import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper; import com.mhd.wms.domain.receiptMaterialDetail.repository.po.ReceiptMaterialDetailPO; import com.mhd.wms.domain.receiptMaterialDetail.repository.todo.ReceiptMaterialDetailDO; import com.mhd.wms.domain.receiptMaterialDetail.service.ReceiptMaterialDetailDomainService; @@ -126,6 +127,8 @@ public class StockShelfOrderApplicationService { private IShelfMaterialDetailService shelfMaterialDetailService; @Autowired private IStockShelfOrderService stockShelfOrderService; + @Autowired + private PickingMaterialDetailMapper pickingMaterialDetailMapper; private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_qnBill_i"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; @@ -2652,7 +2655,7 @@ public class StockShelfOrderApplicationService { Long organizationId = loginUser != null ? loginUser.getUserPo().getOrganizationId() : null; Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; - + String ncUrl = pickingMaterialDetailMapper.getNcUrl("gw", organizationName, organizationId); int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); @@ -2703,7 +2706,14 @@ public class StockShelfOrderApplicationService { customsBodyList.add(customsParam); CloseableHttpClient customsHttpClient = HttpClients.createDefault(); - HttpPost customsHttpPost = new HttpPost(PUSH_API_URL); + String url = ""; + if (ncUrl != null) { + url = ncUrl; + } else { + url = PUSH_API_URL; + } + HttpPost customsHttpPost = new HttpPost(url); +// HttpPost customsHttpPost = new HttpPost(PUSH_API_URL); StringEntity customsPostingString = new StringEntity(com.alibaba.fastjson.JSONObject.toJSONString(customsBodyList), "UTF-8"); customsHttpPost.setEntity(customsPostingString); customsHttpPost.setHeader("Content-type", "application/json"); @@ -2858,7 +2868,13 @@ public class StockShelfOrderApplicationService { updatePushStatus(id, 2, new Date(), pushBy,pushByName); CloseableHttpClient httpClient = HttpClients.createDefault(); - HttpPost httpPost = new HttpPost(PUSH_API_URL); + String url = ""; + if (ncUrl != null) { + url = ncUrl; + } else { + url = PUSH_API_URL; + } + HttpPost httpPost = new HttpPost(url); StringEntity postingString = new StringEntity(com.alibaba.fastjson.JSONObject.toJSONString(bodyList), "UTF-8"); httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java index 29bf0b13d..b7e5450bc 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/repository/mapper/PickingMaterialDetailMapper.java @@ -72,4 +72,6 @@ public interface PickingMaterialDetailMapper extends BaseMapper + + \ No newline at end of file From 7d13b421446cf1a7d64b732ce1184f27e24b9a34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 18:48:20 +0800 Subject: [PATCH 22/37] =?UTF-8?q?=E5=85=B3=E5=8A=A1=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=8A=A8=E6=80=81url=E5=9C=B0=E5=9D=80;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java index 7f01532c9..0cb2fffeb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java @@ -321,7 +321,7 @@ public class ShelfMaterialDetail extends BaseVOEntity { @ApiModelProperty("累计已上架净重(KG)，与 totalNetWeight 同口径累加本次净重") // update会报错注释 -// @TableField("total_net_weight") + @TableField(value = "total_net_weight", exist = false) private BigDecimal alreadyShelvesNetWeight; @ApiModelProperty("总毛重(KG)") From 7650bd2eb9271564bef5224f36c9702af9075f6e Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 18:50:06 +0800 Subject: [PATCH 23/37] =?UTF-8?q?=E5=8D=95=E8=AF=81=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessDocumentOrder/BusinessDocumentOrderMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml index 56ea9d2ff..6f5ccbf0d 100644 --- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml @@ -690,7 +690,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bdo.DOCUMENT_DATE =]]> #{documentDateStart} - and bdo.DOCUMENT_DATE #{documentDateEnd} + 1 - 1/86400 + and bdo.DOCUMENT_DATE #{documentDateEnd} and bdo.PUSH_TIME =]]> #{pushTimeStart} @@ -1246,7 +1246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and DOCUMENT_DATE =]]> #{documentDateStart} - and DOCUMENT_DATE #{documentDateEnd} + 1 - 1/86400 + and DOCUMENT_DATE #{documentDateEnd} and PUSH_TIME =]]> #{pushTimeStart} From feb614e3e497bca70c785076dcc70657cf3bc79f Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 19:04:04 +0800 Subject: [PATCH 24/37] =?UTF-8?q?=E5=8D=95=E8=AF=81=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OriginalImportExportDocumentApi.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java index 6e2ef50a1..d408c8a10 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java +++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/originalImportExportDocument/OriginalImportExportDocumentApi.java @@ -95,6 +95,20 @@ public class OriginalImportExportDocumentApi extends BaseController { @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo, @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) { BusinessDocumentOrderDO businessDocumentOrderDO = businessDocumentOrderAssembler.toDO(businessDocumentOrderDTO); + // 时区处理：前端传的日期是东八区，Spring按UTC解析，加8小时对齐数据库时区 + long tzOffset = 8 * 60 * 60 * 1000L; + if (businessDocumentOrderDO.getDocumentDateStart() != null) { + businessDocumentOrderDO.setDocumentDateStart(new Date(businessDocumentOrderDO.getDocumentDateStart().getTime() + tzOffset)); + } + if (businessDocumentOrderDO.getDocumentDateEnd() != null) { + businessDocumentOrderDO.setDocumentDateEnd(new Date(businessDocumentOrderDO.getDocumentDateEnd().getTime() + tzOffset)); + } + if (businessDocumentOrderDO.getPushTimeStart() != null) { + businessDocumentOrderDO.setPushTimeStart(new Date(businessDocumentOrderDO.getPushTimeStart().getTime() + tzOffset)); + } + if (businessDocumentOrderDO.getPushTimeEnd() != null) { + businessDocumentOrderDO.setPushTimeEnd(new Date(businessDocumentOrderDO.getPushTimeEnd().getTime() + tzOffset)); + } PageHelper.startPage(pageNo, pageSize); List orderList = businessDocumentOrderApplicationService.queryListAndMaterial(businessDocumentOrderDO); From 1b5914a7d131a061a4e4dd5916aac6e3cb0dff5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 19:10:14 +0800 Subject: [PATCH 25/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shelfMaterialDetail/entity/ShelfMaterialDetail.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java index 0cb2fffeb..0ab70d238 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shelfMaterialDetail/entity/ShelfMaterialDetail.java @@ -329,7 +329,7 @@ public class ShelfMaterialDetail extends BaseVOEntity { private BigDecimal totalGrossWeight; @ApiModelProperty("累计已上架毛重(KG)，与 totalGrossWeight 同口径累加本次毛重") - @TableField("total_gross_weight") + @TableField(value = "total_gross_weight", exist = false) private BigDecimal alreadyShelvesGrossWeight; @ApiModelProperty("总体积(CBM)") @@ -337,7 +337,7 @@ public class ShelfMaterialDetail extends BaseVOEntity { private BigDecimal totalVolume; @ApiModelProperty("累计已上架体积(CBM)，与 totalVolume 同口径累加本次体积") - @TableField("total_volume") + @TableField(value = "total_volume", exist = false) private BigDecimal alreadyShelvesVolume; @ApiModelProperty("总面积(SQM)") @@ -353,7 +353,7 @@ public class ShelfMaterialDetail extends BaseVOEntity { private String lotNumber; @ApiModelProperty("累计已上架面积(SQM)，与 totalArea 同口径累加本次面积") - @TableField("total_area") + @TableField(value = "total_area", exist = false) private BigDecimal alreadyShelvesArea; @ApiModelProperty("抄码托盘号") From 0b3df4bf3231e73c71a2b430351535b3dbbf4e8f Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 19:54:59 +0800 Subject: [PATCH 26/37] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E5=88=A0=E6=94=B9=E5=8D=95?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessDocumentOrder/BusinessDocumentOrderMapper.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml index 6f5ccbf0d..bee4d0123 100644 --- a/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/businessDocumentOrder/BusinessDocumentOrderMapper.xml @@ -1260,6 +1260,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and REVISE_APPLY_TYPE = #{reviseApplyType} + + and REVISE_APPLY_STATUS = #{reviseApplyStatus} + From 2c16152c0bed9dd50840e13e9d7d134346f700d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 19:57:40 +0800 Subject: [PATCH 27/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../po/ReservationInMaterialDetailPO.java | 1 + .../po/ReservationOutMaterialDetailPO.java | 1 + .../repository/po/ReservationStockInOrderPO.java | 1 + .../ReservationStockInOrderApplicationService.java | 12 +++++++++++- .../repository/po/ReservationStockOutOrderPO.java | 1 + ...ReservationStockOutOrderApplicationService.java | 11 +++++++++-- .../StockInOrderApplicationService.java | 14 +++++++++++++- .../StockOutOrderApplicationService.java | 10 ++++++++-- .../repository/po/InMaterialDetailPO.java | 1 + .../repository/po/OutMaterialDetailPO.java | 1 + .../stockInOrder/repository/po/StockInOrderPO.java | 1 + .../repository/po/StockOutOrderPO.java | 1 + 12 files changed, 49 insertions(+), 6 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java index 9394dd4d6..c3203fdf1 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java @@ -494,4 +494,5 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO private BigDecimal erpPriceGw; //申报总价 private BigDecimal amountGw; + private String khdm; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java index eff6eaa40..8a33c427c 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java @@ -602,4 +602,5 @@ public class ReservationOutMaterialDetailPO extends ReservationStockOutOrderBase private BigDecimal amountGw; private String inOrderNumberGw; private String inLineNumGw; + private String khdm; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java index a86c24a0d..a46613252 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java @@ -476,4 +476,5 @@ public class ReservationStockInOrderPO extends BaseVOEntity { @ApiModelProperty("业务计价方式") private String businessPriceWay; + private String khdm; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index 045921681..88898828f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -267,7 +267,17 @@ public class ReservationStockInOrderApplicationService { */ public ReservationStockInOrderPO getInfo(Long inOrderId) { - return stockInOrderDomainService.getInfo(inOrderId); + ReservationStockInOrderPO info = stockInOrderDomainService.getInfo(inOrderId); + String userNcCode = reservationStockInOrderMapper.getUserNcCode(info.getShipperId()); + info.setKhdm(userNcCode); + List materialDetailList = info.getMaterialDetailList(); + if (materialDetailList != null && !materialDetailList.isEmpty()) { + for (ReservationInMaterialDetailPO materialDetail : materialDetailList) { + materialDetail.setKhdm(userNcCode); + } + info.setMaterialDetailList(materialDetailList); + } + return info; } diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java index 0ca311ffd..c819e15ff 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java @@ -504,4 +504,5 @@ public class ReservationStockOutOrderPO extends BaseVOEntity { @ApiModelProperty("车次") @Excel(name = "车次") private Integer trainNo; + private String khdm; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java index 0603aee0b..06efd66ee 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java @@ -294,11 +294,18 @@ public class ReservationStockOutOrderApplicationService { public ReservationStockOutOrderPO getInfoChildren(Long outOrderId) { ReservationStockOutOrderPO stockOutOrderPO = stockOutOrderDomainService.getInfoChildren(outOrderId); - + String userNcCode = reservationStockInOrderMapper.getUserNcCode(stockOutOrderPO.getShipperId()); if (stockOutOrderPO == null || CollectionUtils.isEmpty(stockOutOrderPO.getMaterialDetailList())) { return stockOutOrderPO; } - + stockOutOrderPO.setKhdm(userNcCode); + List materialDetailList = stockOutOrderPO.getMaterialDetailList(); + if (CollectionUtils.isEmpty(materialDetailList)) { + for (ReservationOutMaterialDetailPO reservationOutMaterialDetailPO : materialDetailList) { + reservationOutMaterialDetailPO.setKhdm(userNcCode); + } + stockOutOrderPO.setMaterialDetailList(materialDetailList); + } List detailList = stockOutOrderPO.getMaterialDetailList(); String outOrderNumber = stockOutOrderPO.getOutOrderNumber(); for (ReservationOutMaterialDetailPO reservationOutMaterialDetailPO : detailList) { diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 87de6a8e1..6742ef175 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -484,7 +484,19 @@ public class StockInOrderApplicationService { */ public StockInOrderPO getInfo(Long inOrderId) { - return stockInOrderDomainService.getInfo(inOrderId); + StockInOrderPO info = stockInOrderDomainService.getInfo(inOrderId); + String userNcCode = stockOutOrderMapper.getUserNcCode(info.getShipperId()); + info.setKhdm(userNcCode); + List materialDetailList = info.getMaterialDetailList(); + if (materialDetailList != null && !materialDetailList.isEmpty()) { + for (InMaterialDetailPO inMaterialDetailPO : materialDetailList) { + // TODO: 设置物料详情信息 + inMaterialDetailPO.setKhdm(userNcCode); + } + info.setMaterialDetailList(materialDetailList); + } + + return info; } diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 621dc29cc..107e7c5f9 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -333,13 +333,19 @@ public class StockOutOrderApplicationService { public StockOutOrderPO getInfoChildren(Long outOrderId) { StockOutOrderPO stockOutOrderPO = stockOutOrderDomainService.getInfoChildren(outOrderId); - + String userNcCode = stockOutOrderMapper.getUserNcCode(stockOutOrderPO.getShipperId()); + stockOutOrderPO.setKhdm(userNcCode); if (stockOutOrderPO == null || CollectionUtils.isEmpty(stockOutOrderPO.getMaterialDetailList())) { return stockOutOrderPO; } List detailList = stockOutOrderPO.getMaterialDetailList(); - + if (detailList == null || detailList.isEmpty()) { + for (OutMaterialDetailPO outMaterialDetailPO : detailList) { + outMaterialDetailPO.setKhdm(userNcCode); + } + } + stockOutOrderPO.setMaterialDetailList(detailList); // 性能优化：批量获取批次属性，避免N+1查询问题 // 1. 收集所有唯一的materialBaseInfoId Set materialBaseInfoIdSet = detailList.stream() diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java index b87fa3073..3b4b83ccb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailPO.java @@ -438,4 +438,5 @@ public class InMaterialDetailPO extends StockInOrderBasePO { private BigDecimal erpPriceGw; //申报总价 private BigDecimal amountGw; + private String khdm; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java index 5d61eee52..982a283eb 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailPO.java @@ -567,4 +567,5 @@ public class OutMaterialDetailPO extends StockOutOrderBaseDO { private String bondInvtNoGw; private String whNoGw; private String seatNoGw; + private String khdm; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java index b027613d1..19a78ed27 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java @@ -442,5 +442,6 @@ public class StockInOrderPO extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; + private String khdm; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java index a7e85db20..413f72731 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java @@ -450,4 +450,5 @@ public class StockOutOrderPO extends BaseVOEntity { @ApiModelProperty("推送人姓名") private String pushByName; + private String khdm; } \ No newline at end of file From 6072ac272f54b7fee4743ed0e8eabc55f2a4988e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 20:05:54 +0800 Subject: [PATCH 28/37] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/pickingOrder/PickingOrderMapper.xml | 4 ++-- .../mapper/stockShelfOrder/StockShelfOrderMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index 2c3e1bb51..39e830fd8 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -123,10 +123,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and b.need_declare_flag = #{needDeclareFlag} - and PUSH_TIME =]]> #{pushTimeFrom} + and a.PUSH_TIME =]]> #{pushTimeFrom} - and PUSH_TIME #{pushTimeTo} + and a.PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml index 3bde4a693..b598d1341 100644 --- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml @@ -111,10 +111,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} - and PUSH_TIME =]]> #{pushTimeFrom} + and a.PUSH_TIME =]]> #{pushTimeFrom} - and PUSH_TIME #{pushTimeTo} + and a.PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} From fe2dcc027bf24087455a7f6bd407d966a631add1 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 20:09:22 +0800 Subject: [PATCH 29/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A0=E6=94=B9?= =?UTF-8?q?=E5=8D=95=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessDocumentOrderApplicationService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index 371830eb0..b5f63591f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -435,9 +435,12 @@ public class BusinessDocumentOrderApplicationService { int failCount = 0; StringBuilder failMsg = new StringBuilder(); + // 从数据库查询单证信息，获取运输业务单号 + BusinessDocumentOrder order = businessDocumentOrderMapper.selectById(businessDocumentOrderDTO.getId()); + // 构建单个对象 Map item = new HashMap<>(); - item.put("erpBillNo", businessDocumentOrderDTO.getGoodsNumber()); + item.put("erpBillNo", order != null ? order.getGoodsNumber() : businessDocumentOrderDTO.getGoodsNumber()); item.put("operateType", String.valueOf(businessDocumentOrderDTO.getReviseApplyType())); item.put("appMan", businessDocumentOrderDTO.getReviseApplyBy()); item.put("appMess", businessDocumentOrderDTO.getReviseApplyReason()); From cf22323cfebeb150b7129560bd2dc1d08ef92158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 20:39:58 +0800 Subject: [PATCH 30/37] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/todo/ReservationStockInOrderDO.java | 9 +++++++++ .../repository/todo/ReservationStockInOrderDTO.java | 8 ++++++++ .../repository/todo/ReservationStockOutOrderDO.java | 8 ++++++++ .../repository/todo/ReservationStockOutOrderDTO.java | 8 ++++++++ .../ReservationStockInOrderMapper.xml | 6 ++++++ .../ReservationStockOutOrderMapper.xml | 6 ++++++ .../pickingOrder/repository/todo/PickingOrderDO.java | 9 +++++++++ .../stockInOrder/repository/todo/StockInOrderDO.java | 9 +++++++++ .../repository/todo/StockShelfOrderDO.java | 9 +++++++++ .../interfaces/dto/pickingOrder/PickingOrderDTO.java | 9 +++++++++ .../interfaces/dto/stockInOrder/StockInOrderDTO.java | 9 +++++++++ .../interfaces/dto/stockOutOrder/StockOutOrderDTO.java | 10 ++++++++++ .../dto/stockShelfOrder/StockShelfOrderDTO.java | 9 +++++++++ .../mapper/pickingOrder/PickingOrderMapper.xml | 6 ++++++ .../mapper/stockInOrder/StockInOrderMapper.xml | 10 ++++++++-- .../mapper/stockOutOrder/StockOutOrderMapper.xml | 10 ++++++++-- .../mapper/stockShelfOrder/StockShelfOrderMapper.xml | 6 ++++++ 17 files changed, 137 insertions(+), 4 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java index ce1d39cd6..642436946 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java @@ -476,6 +476,15 @@ public class ReservationStockInOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; private String xfStatus; @ApiModelProperty("运输业务单号") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java index 0e22e4896..9c672d7c8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java @@ -460,7 +460,15 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; private String xfStatus; @ApiModelProperty(name = "入库时间查询条件开始日期") private String storageTimeStart; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java index 33db3338d..e34203385 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java @@ -555,6 +555,14 @@ public class ReservationStockOutOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; private String xfStatus; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java index 481dd1ae8..11f0aa94b 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java @@ -538,7 +538,15 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; @ApiModelProperty(name = "出库时间查询条件开始日期") private String outboundDateStart; diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml index 305e48fff..9e0c737b8 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -435,6 +435,12 @@ and a.PUSH_TIME #{pushTimeTo} + + and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + + and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml index f54fffe06..775ac0c9a 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -315,6 +315,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.PUSH_TIME #{pushTimeTo} + + and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + + and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java index 568496285..b9496b0a8 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java @@ -219,4 +219,13 @@ public class PickingOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java index 51315fe12..4f131966d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java @@ -419,4 +419,13 @@ public class StockInOrderDO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java index 6cd9a2080..b4a947b3e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/repository/todo/StockShelfOrderDO.java @@ -164,4 +164,13 @@ public class StockShelfOrderDO extends StockInOrderBaseDO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java index 8b23f2983..ec6e70228 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/pickingOrder/PickingOrderDTO.java @@ -187,4 +187,13 @@ public class PickingOrderDTO extends BaseVOEntity { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java index 5c419aa2d..ad6b20d0f 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java @@ -417,4 +417,13 @@ public class StockInOrderDTO extends StockInOrderBaseDTO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java index b5e7cda80..4d5862483 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java @@ -474,4 +474,14 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java index 35d44962f..9f2cc0c2d 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockShelfOrder/StockShelfOrderDTO.java @@ -153,4 +153,13 @@ public class StockShelfOrderDTO extends StockInOrderBaseDTO { @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date pushTimeTo; + @ApiModelProperty(value = "推送时间起") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeFrom; + + @ApiModelProperty(value = "推送时间止") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTimeTo; } \ No newline at end of file diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index 39e830fd8..253106e1a 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -128,6 +128,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.PUSH_TIME #{pushTimeTo} + + and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + + and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index 1eff7dba9..23b5ac42d 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -419,10 +419,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} - and PUSH_TIME =]]> #{pushTimeFrom} + and a.PUSH_TIME =]]> #{pushTimeFrom} - and PUSH_TIME #{pushTimeTo} + and a.PUSH_TIME #{pushTimeTo} + + + and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + + and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 0602439d9..26a6da4a8 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -312,11 +312,17 @@ and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd} + + and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + + and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + - and PUSH_TIME =]]> #{pushTimeFrom} + and a.PUSH_TIME =]]> #{pushTimeFrom} - and PUSH_TIME #{pushTimeTo} + and a.PUSH_TIME #{pushTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml index b598d1341..df534bf7e 100644 --- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml @@ -110,6 +110,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} + + and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + + and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + and a.PUSH_TIME =]]> #{pushTimeFrom} From 242f56ae1a66c4f4019a1cfd3386db7a8d9ecb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 20:47:11 +0800 Subject: [PATCH 31/37] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationStockInOrderMapper.xml | 8 ++++---- .../ReservationStockOutOrderMapper.xml | 8 ++++---- .../resources/mapper/pickingOrder/PickingOrderMapper.xml | 8 ++++---- .../resources/mapper/stockInOrder/StockInOrderMapper.xml | 8 ++++---- .../mapper/stockOutOrder/StockOutOrderMapper.xml | 8 ++++---- .../mapper/stockShelfOrder/StockShelfOrderMapper.xml | 8 ++++---- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml index 9e0c737b8..1f315b9af 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml @@ -435,11 +435,11 @@ and a.PUSH_TIME #{pushTimeTo} - - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + and a.create_time =]]> #{createTimeFrom} - - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + + and a.create_time #{createTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml index 775ac0c9a..fa77182c2 100644 --- a/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml +++ b/mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml @@ -315,11 +315,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.PUSH_TIME #{pushTimeTo} - - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + and a.create_time =]]> #{createTimeFrom} - - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + + and a.create_time #{createTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml index 253106e1a..19ef51784 100644 --- a/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/pickingOrder/PickingOrderMapper.xml @@ -128,11 +128,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.PUSH_TIME #{pushTimeTo} - - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + and a.create_time =]]> #{createTimeFrom} - - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + + and a.create_time #{createTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml index 23b5ac42d..a1a04ed25 100644 --- a/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockInOrder/StockInOrderMapper.xml @@ -424,11 +424,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.PUSH_TIME #{pushTimeTo} - - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + and a.create_time =]]> #{createTimeFrom} - - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + + and a.create_time #{createTimeTo} and a.PUSH_STATUS = #{pushStatus} diff --git a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml index 26a6da4a8..c090be1c8 100644 --- a/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockOutOrder/StockOutOrderMapper.xml @@ -312,11 +312,11 @@ and date_format(a.audit_time,'%Y-%m-%d') <= #{auditTimeEnd} - - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + and a.create_time =]]> #{createTimeFrom} - - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + + and a.create_time #{createTimeTo} and a.PUSH_TIME =]]> #{pushTimeFrom} diff --git a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml index df534bf7e..83f0b1861 100644 --- a/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml +++ b/mhd_wms/src/main/resources/mapper/stockShelfOrder/StockShelfOrderMapper.xml @@ -110,11 +110,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeEnd} - - and date_format(a.create_time,'%Y-%m-%d') >= #{createTimeFrom} + + and a.create_time =]]> #{createTimeFrom} - - and date_format(a.create_time,'%Y-%m-%d') <= #{createTimeTo} + + and a.create_time #{createTimeTo} and a.PUSH_TIME =]]> #{pushTimeFrom} From 3248aef4a9ee58c3f0f0415109cdcb4a0955afc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 20:54:09 +0800 Subject: [PATCH 32/37] =?UTF-8?q?=E5=8F=9131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../java/com/mhd/system/api/YmsServiceFeign.java | 2 +- mhd_oms/src/main/resources/bootstrap.yml | 16 ++++++++-------- mhd_wms/src/main/resources/bootstrap.yml | 16 ++++++++-------- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index 91f2f8a11..8cc8bfd57 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 03d48d2f4..560febea1 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index ba9a45148..d976fcc98 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index b7698b1cc..ffe18004f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -20,7 +20,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.33.0.109:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index 48d76d01e..238ec5f81 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.33.0.99:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index b605d0078..2cc32af2d 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -18,17 +18,17 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 -# server-addr: 10.102.192.31:6848 -# username: nacos -# password: manhuoda@2023 +# server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.31:6848 + username: nacos + password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - server-addr: 10.33.0.129:6010 -# server-addr: 10.102.192.31:6848 -# username: nacos -# password: manhuoda@2023 +# server-addr: 10.33.0.129:6010 + server-addr: 10.102.192.31:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 # 锁定server端的配置文件（读取它的配置项） diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index 922e3a301..e8f169bf2 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -14,20 +14,20 @@ spring: nacos: discovery: # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.30:6848 -# username: nacos -# password: manhuoda@2023 + server-addr: 10.102.192.31:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 config: # server-addr: 127.0.0.1:8848 - server-addr: 10.33.0.129:6010 +# server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 -# server-addr: 10.102.192.30:6848 -# username: nacos -# password: manhuoda@2023 + server-addr: 10.102.192.31:6848 + username: nacos + password: manhuoda@2023 #线上正式环境 # server-addr: 10.102.192.105:6848 # 配置文件格式 From da4da4e61e8064af2c464dbce28532eaf493585d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 20:55:29 +0800 Subject: [PATCH 33/37] =?UTF-8?q?=E5=8F=9131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ReservationStockInOrderApplicationService.java | 2 +- .../service/ReservationStockOutOrderApplicationService.java | 2 +- mhd_oms/src/main/resources/bootstrap.yml | 2 +- .../service/pickingOrder/PickingOrderApplicationService.java | 2 +- .../service/stockInOrder/StockInOrderApplicationService.java | 2 +- .../service/stockOutOrder/StockOutOrderApplicationService.java | 2 +- .../stockShelfOrder/StockShelfOrderApplicationService.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index 88898828f..8fd6cd193 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -78,7 +78,7 @@ public class ReservationStockInOrderApplicationService { private ReservationInMaterialDetailMapper reservationInMaterialDetailMapper; // @Autowired // private IMaterialBaseInfoService materialBaseInfoService; - private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_i"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java index 06efd66ee..d3f318eb7 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java @@ -114,7 +114,7 @@ public class ReservationStockOutOrderApplicationService { @Autowired private ReservationStockInOrderMapper reservationStockInOrderMapper; - private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_e"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index 2cc32af2d..542b6bce7 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -40,6 +40,6 @@ spring: # GW推送配置 gw: push: - url: http://10.33.0.100/nagu-erp-api/transfer/pushData + url: http://10.102.192.15/nagu-erp-api/transfer/pushData verify-key1: FuDjK3iuftzwf8kWJ44DDZJ9icZmL9Ee4Valv8Qz6VfsdW60fNEzNSEtrKlUr6OI verify-key2: ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD \ No newline at end of file diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java index 31c6b49b5..d0c1d6e14 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java @@ -102,7 +102,7 @@ public class PickingOrderApplicationService { @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; - private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_qnBill_e"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java index 6742ef175..f3054e140 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java @@ -116,7 +116,7 @@ public class StockInOrderApplicationService { private StockOutOrderMapper stockOutOrderMapper; @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; - private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_i"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java index 107e7c5f9..26b17212a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java @@ -118,7 +118,7 @@ public class StockOutOrderApplicationService { private StockOutOrderMapper stockOutOrderMapper; @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; - private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_order_e"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; diff --git a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java index 1f53550b6..ddeae57b0 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java +++ b/mhd_wms/src/main/java/com/mhd/wms/application/service/stockShelfOrder/StockShelfOrderApplicationService.java @@ -129,7 +129,7 @@ public class StockShelfOrderApplicationService { private IStockShelfOrderService stockShelfOrderService; @Autowired private PickingMaterialDetailMapper pickingMaterialDetailMapper; - private static final String PUSH_API_URL = "http://10.33.0.100/nagu-erp-api/transfer/pushData"; + private static final String PUSH_API_URL = "http://10.102.192.15/nagu-erp-api/transfer/pushData"; private static final String API_NAME = "save_qnBill_i"; private static final String VERIFY = "ESLuxAmB6VXCgbqP1eFzxTPVRagkQ62BUkfhElrgQ6XmE/g2reHVflY/SiCSU7JD"; From 81157cc45177a703249e8fbf78042fc39cc48683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 21:07:41 +0800 Subject: [PATCH 34/37] =?UTF-8?q?=E5=8F=9130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +- mhd_wms/src/main/resources/bootstrap.yml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index 8cc8bfd57..e18484e8d 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 560febea1..e34bb9cd4 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index d976fcc98..e4a817238 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index ffe18004f..8625bcd8e 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -20,7 +20,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index 238ec5f81..dfac7337f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** diff --git a/mhd_wms/src/main/resources/bootstrap.yml b/mhd_wms/src/main/resources/bootstrap.yml index e8f169bf2..fc7380c20 100644 --- a/mhd_wms/src/main/resources/bootstrap.yml +++ b/mhd_wms/src/main/resources/bootstrap.yml @@ -16,7 +16,7 @@ spring: # server-addr: 127.0.0.1:8848 # server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 @@ -25,7 +25,7 @@ spring: # server-addr: 127.0.0.1:8848 # server-addr: 10.33.0.129:6010 # 线上测试环境配置 容器名+端口号 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境 From bc9adf3f194af74c6a565db522b03a062e6bfdaa Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Tue, 23 Jun 2026 21:10:43 +0800 Subject: [PATCH 35/37] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=87=80=E9=87=8D=E5=92=8C=E8=A7=84=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessDocumentOrderApplicationService.java | 4 ++-- .../service/materialInfo/MaterialInfoApplicationService.java | 4 ++-- .../entity/DocumentPushMaterialRecord.java | 4 ++-- .../domain/materialPushRecord/entity/MaterialPushRecord.java | 4 ++-- .../DocumentPushMaterialRecordMapper.xml | 4 ++-- .../mapper/materialPushRecord/MaterialPushRecordMapper.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index b5f63591f..8d7aae772 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -346,11 +346,11 @@ public class BusinessDocumentOrderApplicationService { docRecord.setMaterialCode(material.getMaterialCode()); docRecord.setMaterialName(material.getMaterialName()); docRecord.setGoodsType(material.getGoodsType()); - docRecord.setSpecificationModel(material.getSpecificationModel()); + docRecord.setPackName(material.getPackName()); docRecord.setDeclarationUnit(material.getDeclarationUnit()); docRecord.setCurrency(material.getCurrency()); docRecord.setUnitPrice(material.getUnitPrice()); - docRecord.setNetWeight(material.getWeightLimit()); + docRecord.setWeightLimit(material.getWeightLimit()); docRecord.setGrossWeight(material.getGrossWeight()); } } diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java index 670916107..3d48174d1 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java @@ -204,11 +204,11 @@ public class MaterialInfoApplicationService { record.setMaterialCode(material.getMaterialCode()); record.setMaterialName(material.getMaterialName()); record.setGoodsType(material.getGoodsType()); - record.setSpecificationModel(material.getSpecificationModel()); + record.setPackName(material.getPackName()); record.setDeclarationUnit(material.getDeclarationUnit()); record.setCurrency(material.getCurrency()); record.setUnitPrice(material.getUnitPrice()); - record.setNetWeight(material.getWeightLimit()); + record.setWeightLimit(material.getWeightLimit()); record.setGrossWeight(material.getGrossWeight()); record.setPushTime(now); record.setDelFlag(1); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java b/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java index 3d1052082..de05502d3 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/documentPushMaterialRecord/entity/DocumentPushMaterialRecord.java @@ -34,7 +34,7 @@ public class DocumentPushMaterialRecord implements Serializable { private String materialName; @ApiModelProperty("规格型号") - private String specificationModel; + private String packName; @ApiModelProperty("申报单位") private String declarationUnit; @@ -49,7 +49,7 @@ public class DocumentPushMaterialRecord implements Serializable { private BigDecimal unitPrice; @ApiModelProperty("净重(kg)") - private BigDecimal netWeight; + private BigDecimal weightLimit; @ApiModelProperty("毛重(kg)") private BigDecimal grossWeight; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java index 6ea91988f..01196e594 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java @@ -34,7 +34,7 @@ public class MaterialPushRecord implements Serializable { private String materialName; @ApiModelProperty("规格型号") - private String specificationModel; + private String packName; @ApiModelProperty("申报单位") private String declarationUnit; @@ -49,7 +49,7 @@ public class MaterialPushRecord implements Serializable { private BigDecimal unitPrice; @ApiModelProperty("净重(kg)") - private BigDecimal netWeight; + private BigDecimal weightLimit; @ApiModelProperty("毛重(kg)") private BigDecimal grossWeight; diff --git a/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml b/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml index 32f4dd43f..0a8c78170 100644 --- a/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml +++ b/mhd_oms/src/main/resources/mapper/documentPushMaterialRecord/DocumentPushMaterialRecordMapper.xml @@ -10,12 +10,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + diff --git a/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml b/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml index 2df87e3bb..56084525e 100644 --- a/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml +++ b/mhd_oms/src/main/resources/mapper/materialPushRecord/MaterialPushRecordMapper.xml @@ -9,12 +9,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + From 81c7c9e9f778854eb3b974baa9ff9f235486278b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 21:15:54 +0800 Subject: [PATCH 36/37] =?UTF-8?q?=E5=8F=9131?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index e18484e8d..8cc8bfd57 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index e34bb9cd4..560febea1 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index e4a817238..d976fcc98 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index 8625bcd8e..ffe18004f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -20,7 +20,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index dfac7337f..238ec5f81 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** From 92a554489178c7bc6e6516349ebe866a60066ba1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 23 Jun 2026 21:24:50 +0800 Subject: [PATCH 37/37] =?UTF-8?q?=E5=8F=9130?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/mhd/system/api/BmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/OmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WlhyServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/WmsServiceFeign.java | 2 +- .../src/main/java/com/mhd/system/api/YmsServiceFeign.java | 2 +- mhd_oms/src/main/resources/bootstrap.yml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java index 8cc8bfd57..e18484e8d 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java @@ -18,7 +18,7 @@ import java.util.Set; /** * bms财务结算系统feign调用接口 */ -@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.3:8019",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface BmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java index 560febea1..e34bb9cd4 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.concurrent.CompletableFuture; -@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.4:8017", fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface OmsServiceFeign { diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java index d976fcc98..e4a817238 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.Map; -@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.30:8014",configuration = FeignAutoConfiguration.class) public interface WlhyServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java index ffe18004f..8625bcd8e 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java @@ -20,7 +20,7 @@ import java.util.Map; * @description: TODO * @date 2024/5/10 8:58 **/ -@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.32:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE, url = "http://10.102.192.3:8016", fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class) public interface WmsServiceFeign { /** diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java index 238ec5f81..dfac7337f 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java @@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.33:8018", configuration = FeignAutoConfiguration.class) +@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,fallbackFactory = RemoteBmsFeignFallbackFactory.class,url = "http://10.102.192.4:8018", configuration = FeignAutoConfiguration.class) public interface YmsServiceFeign { /** diff --git a/mhd_oms/src/main/resources/bootstrap.yml b/mhd_oms/src/main/resources/bootstrap.yml index 542b6bce7..ee058f0f6 100644 --- a/mhd_oms/src/main/resources/bootstrap.yml +++ b/mhd_oms/src/main/resources/bootstrap.yml @@ -19,14 +19,14 @@ spring: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 # server-addr: 10.33.0.129:6010 - server-addr: 10.102.192.31:6848 + server-addr: 10.102.192.30:6848 username: nacos password: manhuoda@2023 #线上正式环境