From 6d288d417aa58837997d364aa325a919a3a29831 Mon Sep 17 00:00:00 2001 From: zhaoyf <1783123481@qq.com> Date: Wed, 22 Jul 2026 17:17:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:eas=E6=9F=A5=E8=A7=86=E5=9B=BE=E6=8C=87?= =?UTF-8?q?=E5=AE=9ASchema=EF=BC=8C=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81=E4=BC=98=E5=8C=96=20add?= =?UTF-8?q?=EF=BC=9A=E6=89=93=E5=8D=B0=E5=8D=95=E6=8D=AE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E5=9B=9E=E4=BC=A0=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EasToWmsController.java | 1 + .../impl/InboundEasSyncServiceImpl.java | 85 ++++++++++++++----- .../service/mapper/EasPurchasedtlMapper.xml | 10 +-- .../service/mapper/EasPurchasemstMapper.xml | 12 +-- .../service/impl/ErpSyncService.java | 2 +- .../service/mapper/ErpSyncMapper.java | 5 ++ .../service/core/FormReturnAutoTask.java | 43 ++++++++++ .../wms/pm_manage/allocationIn/index.vue | 4 +- .../src/views/wms/pm_manage/otherIn/index.vue | 4 +- .../views/wms/pm_manage/purchase/index.vue | 4 +- 10 files changed, 135 insertions(+), 35 deletions(-) create mode 100644 nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/FormReturnAutoTask.java diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/controller/EasToWmsController.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/controller/EasToWmsController.java index b295fe7..09447bb 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/controller/EasToWmsController.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/controller/EasToWmsController.java @@ -33,6 +33,7 @@ public class EasToWmsController { @SaIgnore public ResponseEntity billChange(@RequestBody BillChangeDto body) { JSONObject result = easToWmsService.billChangeHandler(body); + //全部转发中鼎开关 Param forwardAllZD = paramService.findByCode(SysParamConstant.FORWARD_ALL_ZD); if (ObjectUtil.isNotEmpty(forwardAllZD) && "1".equals(forwardAllZD.getValue())) { wmsToZDWmdService.syncPurchaseReceiving(body); diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/impl/InboundEasSyncServiceImpl.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/impl/InboundEasSyncServiceImpl.java index 44bc06c..bde475a 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/impl/InboundEasSyncServiceImpl.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/impl/InboundEasSyncServiceImpl.java @@ -104,8 +104,12 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { easMst.setBill_status(PurchaseBillStatus.COMPLETED.getCode()); } //转发中鼎 - wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); - easMst.setForwardZD(2); + try { + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + easMst.setForwardZD(2); + } catch (Exception e) { + easMst.setForwardZD(1); + } } purchasedtlMapper.batchSave(easDtlList); purchasemstMapper.insert(easMst); @@ -113,10 +117,15 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { break; case 3: //删除单据 + LambdaQueryWrapper eq = new LambdaQueryWrapper() + .eq(Purchasemst::getBill_id, billId); + Purchasemst mst = purchasemstMapper.selectOne(eq); + if (mst.getForwardZD() == 2){ + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + } purchasedtlMapper.delete(new LambdaQueryWrapper() .eq(Purchasedtl::getBill_id, billId)); - purchasemstMapper.delete(new LambdaQueryWrapper() - .eq(Purchasemst::getBill_id, billId)); + purchasemstMapper.deleteById(mst.getId()); } } @@ -180,8 +189,12 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { easMst.setBill_status(PurchaseBillStatus.COMPLETED.getCode()); } //转发中鼎 - wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); - easMst.setForwardZD(2); + try { + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + easMst.setForwardZD(2); + } catch (Exception e) { + easMst.setForwardZD(1); + } } purchasedtlMapper.batchSave(easDtlList); purchasemstMapper.insert(easMst); @@ -189,10 +202,15 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { break; case 3: //删除单据 + LambdaQueryWrapper eq = new LambdaQueryWrapper() + .eq(Purchasemst::getBill_id, billId); + Purchasemst mst = purchasemstMapper.selectOne(eq); + if (mst.getForwardZD() == 2){ + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + } purchasedtlMapper.delete(new LambdaQueryWrapper() .eq(Purchasedtl::getBill_id, billId)); - purchasemstMapper.delete(new LambdaQueryWrapper() - .eq(Purchasemst::getBill_id, billId)); + purchasemstMapper.deleteById(mst.getId()); } } @@ -256,8 +274,12 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { easMst.setBill_status(PurchaseBillStatus.COMPLETED.getCode()); } //转发中鼎 - wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); - easMst.setForwardZD(2); + try { + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + easMst.setForwardZD(2); + } catch (Exception e) { + easMst.setForwardZD(1); + } } purchasedtlMapper.batchSave(easDtlList); purchasemstMapper.insert(easMst); @@ -265,10 +287,15 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { break; case 3: //删除单据 + LambdaQueryWrapper eq = new LambdaQueryWrapper() + .eq(Purchasemst::getBill_id, billId); + Purchasemst mst = purchasemstMapper.selectOne(eq); + if (mst.getForwardZD() == 2){ + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + } purchasedtlMapper.delete(new LambdaQueryWrapper() .eq(Purchasedtl::getBill_id, billId)); - purchasemstMapper.delete(new LambdaQueryWrapper() - .eq(Purchasemst::getBill_id, billId)); + purchasemstMapper.deleteById(mst.getId()); } } @@ -332,8 +359,12 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { easMst.setBill_status(PurchaseBillStatus.COMPLETED.getCode()); } //转发中鼎 - wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); - easMst.setForwardZD(2); + try { + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + easMst.setForwardZD(2); + } catch (Exception e) { + easMst.setForwardZD(1); + } } purchasedtlMapper.batchSave(easDtlList); purchasemstMapper.insert(easMst); @@ -341,10 +372,15 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { break; case 3: //删除单据 + LambdaQueryWrapper eq = new LambdaQueryWrapper() + .eq(Purchasemst::getBill_id, billId); + Purchasemst mst = purchasemstMapper.selectOne(eq); + if (mst.getForwardZD() == 2){ + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + } purchasedtlMapper.delete(new LambdaQueryWrapper() .eq(Purchasedtl::getBill_id, billId)); - purchasemstMapper.delete(new LambdaQueryWrapper() - .eq(Purchasemst::getBill_id, billId)); + purchasemstMapper.deleteById(mst.getId()); } } @@ -408,8 +444,12 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { easMst.setBill_status(PurchaseBillStatus.COMPLETED.getCode()); } //转发中鼎 - wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); - easMst.setForwardZD(2); + try { + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + easMst.setForwardZD(2); + } catch (Exception e) { + easMst.setForwardZD(1); + } } purchasedtlMapper.batchSave(easDtlList); purchasemstMapper.insert(easMst); @@ -417,10 +457,15 @@ public class InboundEasSyncServiceImpl implements InboundEasSyncService { break; case 3: //删除单据 + LambdaQueryWrapper eq = new LambdaQueryWrapper() + .eq(Purchasemst::getBill_id, billId); + Purchasemst mst = purchasemstMapper.selectOne(eq); + if (mst.getForwardZD() == 2){ + wmsToZDWmdService.syncPurchaseReceiving(billChangeDto); + } purchasedtlMapper.delete(new LambdaQueryWrapper() .eq(Purchasedtl::getBill_id, billId)); - purchasemstMapper.delete(new LambdaQueryWrapper() - .eq(Purchasemst::getBill_id, billId)); + purchasemstMapper.deleteById(mst.getId()); } } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/mapper/EasPurchasedtlMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/mapper/EasPurchasedtlMapper.xml index 7607815..0c81788 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/mapper/EasPurchasedtlMapper.xml +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/mapper/EasPurchasedtlMapper.xml @@ -36,7 +36,7 @@ unitCode, unit, trackNo - FROM v_uc_cgrk06 + FROM EAS_NOBLE.V_UC_CGRK06 WHERE billid = #{bill_id} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/mapper/EasPurchasemstMapper.xml b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/mapper/EasPurchasemstMapper.xml index 42a3eb8..c99cd9a 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/mapper/EasPurchasemstMapper.xml +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/purchase/service/mapper/EasPurchasemstMapper.xml @@ -28,7 +28,7 @@ modifyDate, status, red - FROM v_uc_cgrk06 + FROM EAS_NOBLE.V_UC_CGRK06 WHERE billid = #{bill_id} @@ -56,7 +56,7 @@ modifyDate, status, billid - FROM V_UC_DBRK02 + FROM EAS_NOBLE.V_UC_DBRK02 WHERE billid = #{bill_id} diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpSyncService.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpSyncService.java index f558d55..d3d3206 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpSyncService.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/impl/ErpSyncService.java @@ -18,6 +18,6 @@ public class ErpSyncService { @Transactional(propagation = Propagation.REQUIRES_NEW) public List list(){ - return erpSyncMapper.selectList(null); + return erpSyncMapper.queryList(); } } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/mapper/ErpSyncMapper.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/mapper/ErpSyncMapper.java index cc25394..23e3bc4 100644 --- a/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/mapper/ErpSyncMapper.java +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/service/mapper/ErpSyncMapper.java @@ -2,8 +2,13 @@ package org.nl.wms.ext_manage.service.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import org.nl.wms.ext_manage.service.dto.ErpMaterial; +import java.util.List; + @Mapper public interface ErpSyncMapper extends BaseMapper { + @Select("SELECT categoryCode,categoryName,skuCode,skuName,model,unitCode,unit,needPick,status FROM EAS_NOBLE.V_UC_Item50 ") + List queryList(); } diff --git a/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/FormReturnAutoTask.java b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/FormReturnAutoTask.java new file mode 100644 index 0000000..83b3035 --- /dev/null +++ b/nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/FormReturnAutoTask.java @@ -0,0 +1,43 @@ +package org.nl.wms.sch_manage.service.core; + +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import lombok.RequiredArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.nl.wms.warehouse_manage.stockReturn.service.IPmStockReturnService; +import org.nl.wms.warehouse_manage.stockReturn.service.dao.PmStockReturn; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * 回传单定时回传 间隔5s一条避免eas系统卡崩 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class FormReturnAutoTask { + + @Autowired + private IPmStockReturnService pmStockReturnService; + + @SneakyThrows + public void run() { + log.info("========>定时回传任务"); + List list = pmStockReturnService.list(new LambdaQueryWrapper() + .eq(PmStockReturn::getStatus, 0) + .or() + .eq(PmStockReturn::getStatus, 2)); + log.info("========>定时回传列表：{}", JSON.toJSONString(list)); + List rows = new ArrayList<>(); + for (PmStockReturn item : list) { + rows.add(item); + pmStockReturnService.uploadRows(rows); + Thread.sleep(1000 * 5); + rows.remove(item); + } + } +} diff --git a/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue b/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue index a37da3a..8701186 100644 --- a/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/allocationIn/index.vue @@ -336,6 +336,7 @@ export default { const orderNo = dtl.order_no || '' const itemNo = dtl.item_no || '' const skuCode = dtl.sku_code || '' + const house_code = dtl.house_code || '' const skuName = dtl.sku_name || '' const qty = dtl.qty || '' const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#' @@ -345,11 +346,12 @@ export default { html += '
' html += '

上海诺力

' html += '' - html += '' + html += '' html += '' html += '' html += '' html += '' + html += '' html += '
单据号' + orderNo + '
单据号' + orderNo + '
行号' + itemNo + '
物料编码' + skuCode + '
物料名称' + skuName + '
数量' + qty + '
仓库' + house_code + '
' } html += '' diff --git a/nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue b/nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue index ccdeb2b..b43a6e4 100644 --- a/nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/otherIn/index.vue @@ -284,6 +284,7 @@ export default { const orderNo = dtl.order_no || '' const itemNo = dtl.item_no || '' const skuCode = dtl.sku_code || '' + const house_code = dtl.house_code || '' const skuName = dtl.sku_name || '' const qty = dtl.qty || '' const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#' @@ -293,11 +294,12 @@ export default { html += '
' html += '

上海诺力

' html += '' - html += '' + html += '' html += '' html += '' html += '' html += '' + html += '' html += '
单据号' + orderNo + '
单据号' + orderNo + '
行号' + itemNo + '
物料编码' + skuCode + '
物料名称' + skuName + '
数量' + qty + '
仓库' + house_code + '
' } html += '' diff --git a/nladmin-ui/src/views/wms/pm_manage/purchase/index.vue b/nladmin-ui/src/views/wms/pm_manage/purchase/index.vue index 23502ec..67a282d 100644 --- a/nladmin-ui/src/views/wms/pm_manage/purchase/index.vue +++ b/nladmin-ui/src/views/wms/pm_manage/purchase/index.vue @@ -353,6 +353,7 @@ export default { const itemNo = dtl.item_no || '' const skuCode = dtl.sku_code || '' const skuName = dtl.sku_name || '' + const house_code = dtl.house_code || '' const qty = dtl.qty || '' const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#' const imgSrc = await QRCode.toDataURL(qrText, { @@ -361,11 +362,12 @@ export default { html += '
' html += '

上海诺力

' html += '' - html += '' + html += '' html += '' html += '' html += '' html += '' + html += '' html += '
单据号' + orderNo + '
单据号' + orderNo + '
行号' + itemNo + '
物料编码' + skuCode + '
物料名称' + skuName + '
数量' + qty + '
仓库' + house_code + '
' } html += ''