From 3869b2ceeb197e56d6950377bb5e808659d294a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Fri, 31 Oct 2025 10:00:28 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=AF=8C=E4=BD=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java | 3 ++- .../wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml | 1 + .../wms/warehouse_manage/service/impl/RetrunServiceImpl.java | 2 +- nladmin-ui/src/views/wms/pm_manage/form_data/index.vue | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java index c2a019d..7dedd24 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/WmsToErpServiceImpl.java @@ -26,6 +26,7 @@ public class WmsToErpServiceImpl implements WmsToErpService { String is_connect_erp = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(SysParamConstant.IS_CONNECT_ERP).getValue(); if(is_connect_erp.equals("1")){ try { + log.info("instorinfoToErp接口地址------------" +url); String resultMsg = HttpRequest.post(url) .body(String.valueOf(whereJson)) .execute().body(); @@ -35,7 +36,7 @@ public class WmsToErpServiceImpl implements WmsToErpService { String status = result.getString("status"); - if (!EXTConstant.ERROR.equals(status)) { + if (EXTConstant.ERROR.equals(status)) { throw new BadRequestException(result.getString("message")); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml index 2c9cf72..2558955 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/service/dao/mapper/xml/PmFormDataMapper.xml @@ -119,6 +119,7 @@ pm_form_data left join md_me_materialbase on pm_form_data.material_code = md_me_materialbase.material_code + (is_merge = 0 or is_merge is null) and form_data LIKE '%${query.search}%' diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java index d597abe..71f78c9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/service/impl/RetrunServiceImpl.java @@ -137,7 +137,7 @@ public class RetrunServiceImpl extends ServiceImpl i for (IOStorInvDis disDao : iosDisList) { JSONObject param = new JSONObject(); // 载具编码 - param.put("pallet_sn", disDao.getStoragevehicle_code()); + param.put("pallet_sn", mst.getVehicle_code()); param.put("instor_time", mst.getConfirm_time()); param.put("barcode", mst.getBarcode()); wmsToErpService.instorinfoToErp(param); diff --git a/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue b/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue index fa61a9e..306fb5c 100644 --- a/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/form_data/index.vue @@ -189,6 +189,7 @@ +