From 10c895ff804ef5a2d461ce837aea17762b842238 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Fri, 26 Sep 2025 14:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E6=94=B6=E7=89=A9=E6=96=99=20?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=20=E4=BE=9B=E5=BA=94=E5=95=86=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/ToErpApiController.java | 30 +++++----- .../com/ruoyi/api/service/IToErpService.java | 13 ++++ .../api/service/impl/ToErpServiceImpl.java | 60 +++++++++++++++++++ .../api/service/impl/ToWmsServiceImpl.java | 4 -- 4 files changed, 89 insertions(+), 18 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java index 745883e..a209d57 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java @@ -6,14 +6,14 @@ import com.ruoyi.api.domain.RequestEnter; import com.ruoyi.api.domain.WmsJobRequest; import com.ruoyi.api.service.IToErpService; import com.ruoyi.api.service.IToWmsService; +import com.ruoyi.bas.BasCustomer.domain.BasCustomer; +import com.ruoyi.bas.BasProduct.domain.BasProduct; +import com.ruoyi.bas.BasSupplier.domain.BasSupplier; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.log.domain.RequestLog; import com.ruoyi.log.service.IRequestLogService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.Map; @@ -27,24 +27,26 @@ public class ToErpApiController { @Autowired private IToErpService toErpService; - /** - * 入库完成回传 - */ - - - /** - * 出库完成回传 - */ - /** * 接收物料信息 */ - + @GetMapping("/receiveMaterial") + public AjaxResult receiveMaterial(@RequestBody BasProduct basProduct) { + return toErpService.receiveMaterial(basProduct); + } /** * 接收客户信息 */ + @GetMapping("/receiveCustomer") + public AjaxResult receiveCustomer(@RequestBody BasCustomer basProduct) { + return toErpService.receiveCustomer(basProduct); + } /** * 接收供应商信息 */ + @GetMapping("/receiveSupplier") + public AjaxResult receiveSupplier(@RequestBody BasSupplier basSupplier) { + return toErpService.receiveSupplier(basSupplier); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java index d16a951..aa76ea9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java @@ -1,5 +1,10 @@ package com.ruoyi.api.service; +import com.ruoyi.bas.BasCustomer.domain.BasCustomer; +import com.ruoyi.bas.BasProduct.domain.BasProduct; +import com.ruoyi.bas.BasSupplier.domain.BasSupplier; +import com.ruoyi.common.core.domain.AjaxResult; + import java.util.Map; /** @@ -9,4 +14,12 @@ public interface IToErpService { Map saveTransferBill(); + + Map billCompletedCallBack(); + + AjaxResult receiveMaterial(BasProduct basProduct); + + AjaxResult receiveCustomer(BasCustomer basProduct); + + AjaxResult receiveSupplier(BasSupplier basSupplier); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java index 8dd6a63..b99bbb2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java @@ -1,10 +1,18 @@ package com.ruoyi.api.service.impl; +import cn.hutool.core.util.ObjUtil; import cn.hutool.http.HttpUtil; import com.ruoyi.api.mapper.JobStatisticsMapper; import com.ruoyi.api.service.IJobStatisticsService; import com.ruoyi.api.service.IToErpService; +import com.ruoyi.bas.BasCustomer.domain.BasCustomer; +import com.ruoyi.bas.BasCustomer.service.IBasCustomerService; +import com.ruoyi.bas.BasProduct.domain.BasProduct; +import com.ruoyi.bas.BasProduct.service.IBasProductService; +import com.ruoyi.bas.BasSupplier.domain.BasSupplier; +import com.ruoyi.bas.BasSupplier.service.IBasSupplierService; import com.ruoyi.bas.cargoSpace.mapper.BasCargoSpaceMapper; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.mapper.MydoJobMapper; @@ -22,6 +30,15 @@ import java.util.Map; @Service public class ToErpServiceImpl implements IToErpService { + @Autowired + private IBasProductService basProductService; + + @Autowired + private IBasSupplierService basSupplierService; + + @Autowired + private IBasCustomerService basCustomerService; + @Override public Map saveTransferBill() { @@ -29,4 +46,47 @@ public class ToErpServiceImpl implements IToErpService { map.put("code","200"); return map; } + + @Override + public Map billCompletedCallBack() { + HashMap map = new HashMap<>(); + map.put("code","200"); + return map; + } + + @Override + public AjaxResult receiveMaterial(BasProduct basProduct) { + String productId = basProduct.getProductId(); + BasProduct oldProduct = basProductService.selectBasProductByProductId(productId); + if (ObjUtil.isNotNull(oldProduct)){ + basProductService.updateBasProduct(basProduct); + }else { + basProductService.insertBasProduct(basProduct); + } + return AjaxResult.success(); + } + + @Override + public AjaxResult receiveCustomer(BasCustomer basCustomer) { + String customerNo = basCustomer.getId(); + BasCustomer oldCustomer = basCustomerService.selectBasCustomerById(customerNo); + if (ObjUtil.isNotNull(oldCustomer)){ + basCustomerService.updateBasCustomer(basCustomer); + }else { + basCustomerService.insertBasCustomer(basCustomer); + } + return AjaxResult.success(); + } + + @Override + public AjaxResult receiveSupplier(BasSupplier basSupplier) { + String supplierNo = basSupplier.getId(); + BasSupplier oldSupplier = basSupplierService.selectBasSupplierById(supplierNo); + if (ObjUtil.isNotNull(oldSupplier)){ + basSupplierService.updateBasSupplier(basSupplier); + }else { + basSupplierService.insertBasSupplier(basSupplier); + } + return AjaxResult.success(); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index 5c162d9..04cae49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -2,7 +2,6 @@ package com.ruoyi.api.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.ruoyi.api.domain.ReMaterialParam; @@ -17,16 +16,13 @@ import com.ruoyi.bas.BasProductCode.util.ProcodeUtils; import com.ruoyi.bas.basJobId.service.IBasJobIdService; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; -import com.ruoyi.bas.container.domain.BasContainer; import com.ruoyi.bas.container.service.IBasContainerService; import com.ruoyi.bas.roadway.domain.BasRoadway; import com.ruoyi.bas.roadway.service.IBasRoadwayService; -import com.ruoyi.bas.tag.domain.BasTag; import com.ruoyi.bas.tag.service.IBasTagService; import com.ruoyi.bas.taskNo.service.IBasTaskNoService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.device.agv.domain.AgvContainerTask; import com.ruoyi.device.agv.service.IAgvContainerTaskService; import com.ruoyi.in.erp.domain.TransferBillCallback; import com.ruoyi.in.erp.service.ITransferBillCallbackService;