From 798d06e045f5a70bb912775c556e4a80b5bd508d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com> Date: Fri, 12 Dec 2025 08:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E6=9D=90=E5=BA=93=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 24 ++++- .../wms/service/IOdsProcureOrderService.java | 10 +- .../impl/OdsProcureOrderServiceImpl.java | 94 +++++++++++++++++-- 3 files changed, 118 insertions(+), 10 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java index d344411ce..05359e21d 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsToWCSmissionController.java @@ -12,6 +12,8 @@ import com.op.common.log.annotation.Log; import com.op.common.log.enums.BusinessType; import com.op.common.security.annotation.RequiresPermissions; import com.op.wms.domain.*; +import com.op.wms.domain.wcs.WcsOutBoundRequestParams; +import com.op.wms.domain.wcs.WcsRequestParams; import com.op.wms.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -988,9 +990,9 @@ public class WmsToWCSmissionController { * @return */ @PostMapping("/addOrderCardXNew") - public AjaxResult addOrderCardXNew(@RequestBody OdsProcureOrder order) { - String result = odsProcureOrderService.addOrderCardXNew(order); - return success(result); + public AjaxResult addOrderCardXNew(@RequestBody OdsProcureOrder order) throws Exception { +// String result = + return odsProcureOrderService.addOrderCardXNew(order); } /** * 修改标识卡---要可以修改入库数量的操作（）按照最新修改的收货操作下，---要想实现的话，标识卡应该有应入数量（），已入数量（），最新要操作数量（User_Defined9），并且， @@ -1004,4 +1006,20 @@ public class WmsToWCSmissionController { String result = odsProcureOrderService.upbatCardXNew(order); return success(result); } + + @PostMapping("/packingMaterialsRequestInboundNew") + public AjaxResult packingMaterialsRequestInboundNew(@RequestBody WcsRequestParams wcsRequestParams) throws Exception { + return odsProcureOrderService.packingMaterialsRequestInboundNew(wcsRequestParams); + } + @PostMapping("/packingMaterialsRequestOutboundNew") + public AjaxResult packingMaterialsRequestOutboundNew(@RequestBody WcsOutBoundRequestParams wcsOutBoundRequestParams) throws Exception { + return odsProcureOrderService.packingMaterialsRequestOutboundNew(wcsOutBoundRequestParams); + } + + + @PostMapping("/packingMaterialsInboundCompletedNew") + public AjaxResult packingMaterialsInboundCompletedNew(@RequestBody WcsRequestParams wcsRequestParams) throws Exception { + return odsProcureOrderService.packingMaterialsInboundCompletedNew(wcsRequestParams); + } + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index 37cec3ccd..a7e43480e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -5,6 +5,8 @@ import java.util.List; import com.op.common.core.domain.R; import com.op.common.core.web.domain.AjaxResult; import com.op.wms.domain.*; +import com.op.wms.domain.wcs.WcsOutBoundRequestParams; +import com.op.wms.domain.wcs.WcsRequestParams; /** * 包材采购单Service接口 @@ -150,7 +152,7 @@ public interface IOdsProcureOrderService { List selectCardList(OdsProcureOrder odsProcureOrder); - String addOrderCardXNew(OdsProcureOrder orderList); + AjaxResult addOrderCardXNew(OdsProcureOrder orderList) throws Exception; String upbatCardXNew(OdsProcureOrder order); @@ -164,4 +166,10 @@ public interface IOdsProcureOrderService { List selectOrderCardTLTWO(OdsProcureOrder odsProcureOrder); void batchSapTl(List orderList); + + AjaxResult packingMaterialsRequestInboundNew(WcsRequestParams wcsRequestParams) throws Exception; + + AjaxResult packingMaterialsInboundCompletedNew(WcsRequestParams wcsRequestParams); + + AjaxResult packingMaterialsRequestOutboundNew(WcsOutBoundRequestParams wcsOutBoundRequestParams) throws Exception; } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 5dd781995..fd31bca92 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -1,6 +1,7 @@ package com.op.wms.service.impl; +import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; @@ -14,11 +15,13 @@ import java.time.format.DateTimeFormatter; import java.util.*; +import com.op.common.core.constant.Constants; import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; import com.op.common.core.utils.StringUtils; +import com.op.common.core.utils.http.HttpUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.system.api.RemoteOpenService; @@ -28,6 +31,8 @@ import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO; import com.op.system.api.domain.sap.SapBackflushMPQuery; import com.op.system.api.domain.sap.SapMaterialPosting; import com.op.system.api.domain.sap.SapPurchaseOrderQuery; +import com.op.wms.domain.wcs.WcsOutBoundRequestParams; +import com.op.wms.domain.wcs.WcsRequestParams; import okhttp3.OkHttpClient; import okhttp3.MediaType; import okhttp3.RequestBody; @@ -90,6 +95,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { private BaseAreaMapper baseAreaMapper; @Value("${dayin.url1}") private String dayinUrl1; + @Value("${wcs.InboundUrl}") + private String InboundUrl; + @Value("${wcs.OutboundUrl}") + private String OutboundUrl; /** * 查询包材采购单 * @@ -915,7 +924,21 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { qcCheckTaskIncomeDTO.setIncomeBatchNo(order1.getUserDefined7());//批次号 qcCheckTaskIncomeDTO.setOrderNo(order1.getProcureCode()+order1.getUserDefined7()); qcCheckTaskIncomeDTO.setIncomeTime(new Date()); - R ruslt= remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO); + R ruslt= remoteQualityService.createIncomeTask(qcCheckTaskIncomeDTO);//生成质检任务 +// WcsRequestParams wcsRequestParams =new WcsRequestParams(); +// wcsRequestParams.setReqCode(IdUtils.randomUUID());//请求码 +// wcsRequestParams.setReqTime(DateUtils.getTime());//时间戳 +// wcsRequestParams.setRfidNo(odsProcureOrder.getSn());//托盘码 +// wcsRequestParams.setBatchNo(order1.getUserDefined7());//批次号 +// wcsRequestParams.setSku(order1.getMaterialCode());//物料编码 +// wcsRequestParams.setQty(odsProcureOrder.getCzNumber().intValue());//数量 +// wcsRequestParams.setQualityStatus(1);//质检状态（默认未质检） +// wcsRequestParams.setSourceAddress("P3304");//起始点位 +// wcsRequestParams.setDestinationAddress("BC001");//目标库位 +// wcsRequestParams.setTaskType(1); +// String requestParam = JSON.toJSONString(wcsRequestParams); + // String result = HttpUtils.sendPostWechart(InboundUrl,requestParam); + // this.packingMaterialsRequestInboundNew(wcsRequestParams); // 成功后修改-- if (ruslt.getCode()==200){//成功 odsProcureOrderMapper.updateOdsProcureOrderAddOperationNumber(odsProcureOrder); @@ -1302,15 +1325,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } @Override - public String addOrderCardXNew(OdsProcureOrder ordernew) { + public AjaxResult addOrderCardXNew(OdsProcureOrder ordernew) throws Exception { String factoryCode = ordernew.getFactoryCode(); //现在是传了个list标识卡集合 String result1="操作成功"; DynamicDataSourceContextHolder.push("ds_" + factoryCode); List orderList= odsProcureOrderMapper.selectCardListSH(ordernew); if (orderList.size()==0){ - result1="生成的标识卡已经暂收完成"; - return result1; + // result1="生成的标识卡已经暂收完成"; + return AjaxResult.success("生成的标识卡已经暂收完成"); } //到货单生成 @@ -1545,6 +1568,21 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } // wmsRawOrderInSnMapper.updateU1Byid(wmsRawOrderInSn);//入库 } +// WcsRequestParams wcsRequestParams =new WcsRequestParams(); +// wcsRequestParams.setReqCode(IdUtils.randomUUID()); +// wcsRequestParams.setReqTime(DateUtils.getTime()); +// wcsRequestParams.setRfidNo("r123456");//托盘码 +// wcsRequestParams.setBatchNo("202508130001");//批次号 +// wcsRequestParams.setSku(ordernew.getMaterialCode());//物料编码 +// wcsRequestParams.setQty(1000);//数量 +// wcsRequestParams.setQualityStatus(1); +// wcsRequestParams.setSourceAddress("P3304");//起始点位 +// wcsRequestParams.setDestinationAddress("BC001");//目标库位 +// wcsRequestParams.setTaskType(1); +// String requestParam = JSON.toJSONString(wcsRequestParams); +// // String result = HttpUtils.sendPostWechart(InboundUrl,requestParam); +// this.packingMaterialsRequestInboundNew(wcsRequestParams); + return AjaxResult.success(result1); }else {////失败| result1="暂收失败"; if (StringUtils.isNotEmpty(result2.getMsg())) { @@ -1557,9 +1595,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order2.setSapTempStatus("0");//0是失败。1是成功 odsProcureOrderMapper.updateOdsProcureOrder(order2); } - return result1; + return AjaxResult.error(result1); } - return result1; + } @Override @@ -4063,4 +4101,48 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { OutboundPostingzcSAPTH(orderList1); } } + + @Override + public AjaxResult packingMaterialsRequestInboundNew(WcsRequestParams wcsRequestParams) throws Exception { + wcsRequestParams.setReqCode(IdUtils.randomUUID()); + wcsRequestParams.setReqTime(DateUtils.getTime()); + wcsRequestParams.setRfidNo("r123456"); + wcsRequestParams.setBatchNo("202508130001"); + wcsRequestParams.setSku("40000018956"); + wcsRequestParams.setQty(1000); + wcsRequestParams.setQualityStatus(1); + wcsRequestParams.setSourceAddress("P3304"); + wcsRequestParams.setDestinationAddress("BC001"); + wcsRequestParams.setTaskType(1); + String requestParam = JSON.toJSONString(wcsRequestParams); + String result = HttpUtils.sendPostWechart(InboundUrl,requestParam); + return AjaxResult.success(result); + } + + @Override + public AjaxResult packingMaterialsInboundCompletedNew(WcsRequestParams wcsRequestParams) { + //业务逻辑 + AjaxResult ajaxResult =new AjaxResult(); + ajaxResult.put("code", 0); + ajaxResult.put("reqCode",wcsRequestParams.getReqCode()); + ajaxResult.put("message", "OK"); + return ajaxResult; + } + + @Override + public AjaxResult packingMaterialsRequestOutboundNew(WcsOutBoundRequestParams wcsOutBoundRequestParams) throws Exception { + wcsOutBoundRequestParams.setReqCode(IdUtils.randomUUID()); + wcsOutBoundRequestParams.setReqTime(DateUtils.getTime()); + wcsOutBoundRequestParams.setWarehouseNo("WH02"); + wcsOutBoundRequestParams.setOrderNo("100348930"); + WcsOutBoundRequestParams.OrderLine wcsRequestParams_OrderLine = new WcsOutBoundRequestParams.OrderLine(); + wcsRequestParams_OrderLine.setContainerNo("r123456"); + wcsRequestParams_OrderLine.setLocation("XL01"); + List objectList = new ArrayList<>(); + objectList.add(wcsRequestParams_OrderLine); + wcsOutBoundRequestParams.setOrderLines(objectList); + String requestParam = JSON.toJSONString(wcsOutBoundRequestParams); + String result = HttpUtils.sendPostWechart(OutboundUrl,requestParam); + return AjaxResult.success(result); + } }