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] =?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");