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 b0742daf8..f11d47340 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 @@ -1,13 +1,11 @@ package com.op.wms.controller; -import com.baomidou.dynamic.datasource.annotation.DS; -import com.op.common.core.domain.R; + import com.op.common.core.utils.StringUtils; import com.op.common.core.web.domain.AjaxResult; -import com.op.common.log.annotation.Log; -import com.op.common.log.enums.BusinessType; +import com.op.system.api.RemoteOpenService; import com.op.wms.domain.*; import com.op.wms.service.*; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +32,8 @@ public class WmsToWCSmissionController { private IOdsWhiteEmbryoService iOdsWhiteEmbryoService; @Autowired private IOdsProductEmbryoInventoryService odsProductEmbryoInventoryService; + + /** * 包材请求入库--- * @@ -273,11 +273,20 @@ public class WmsToWCSmissionController { */ @PostMapping("/sapPurchaseOrderSync") public AjaxResult sapPurchaseOrderSync(@RequestBody OdsProcureOrder odsProcureOrder) { - AjaxResult result = odsProcureOrderService.sapPurchaseOrderSync(odsProcureOrder); return result; } - + /** + * 采购提单-送货单提单 + * + * @param odsProcureOrder + * @return + */ + @PostMapping("/getDeliveryNoteDetail") + public AjaxResult getDeliveryNoteDetail(@RequestBody OdsProcureOrder odsProcureOrder) { + AjaxResult result = odsProcureOrderService.getDeliveryNoteDetail(odsProcureOrder); + return result; + } /** * 成品 @@ -691,4 +700,6 @@ public class WmsToWCSmissionController { return iWmsToWCSmissionService.liftTakeOrPutCompleted(wcsdto); } + + } 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 2a3953371..e70129877 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 @@ -103,4 +103,6 @@ public interface IOdsProcureOrderService { OdsProcureOrder selectArrivalRegistration(OdsProcureOrder odsProcureOrder); List ArrivalRegistrationreader(OdsProcureOrder odsProcureOrder); + + AjaxResult getDeliveryNoteDetail(OdsProcureOrder odsProcureOrder); } 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 cc054e950..5b6f027d0 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 @@ -17,6 +17,7 @@ import com.op.common.core.domain.R; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; +import com.op.system.api.RemoteOpenService; import com.op.system.api.RemoteQualityService; import com.op.system.api.RemoteSapService; import com.op.system.api.domain.quality.QcCheckTaskIncomeDTO; @@ -72,7 +73,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Autowired private BaseWarehouseMapper baseWarehouseMapper; - + @Autowired + private RemoteOpenService remoteOpenService; /** * 查询包材采购单 * @@ -776,6 +778,64 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return orderList; } + @Override + public AjaxResult getDeliveryNoteDetail(OdsProcureOrder odsProcureOrder) { + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + SapPurchaseOrderQuery sapPurchaseOrderQuery = new SapPurchaseOrderQuery(); + sapPurchaseOrderQuery.setEbeln(odsProcureOrder.getProcureCode());//采购单号 + Map paramMap=new HashMap<>(); + paramMap.put("id",odsProcureOrder.getUserDefined5()); + AjaxResult result = remoteOpenService.getDeliveryNoteDetail(paramMap); + List> mapList = new ArrayList<>(); + if (result.get("code").equals(200)) { + mapList= (List>) result.get("data"); + for (Map sapPurchaseOrderQuery1 : mapList) { + OdsProcureOrder order = new OdsProcureOrder(); + // 获取 orderId 和 mainId + Object orderIdObj = sapPurchaseOrderQuery1.get("orderId"); + Object mainIdObj = sapPurchaseOrderQuery1.get("mainId"); + + // 将 Object 转换为 String + String orderId = (orderIdObj != null) ? orderIdObj.toString() : null; + String mainId = (mainIdObj != null) ? mainIdObj.toString() : null; + // 判断并补全 orderId + if (orderId != null && orderId.length() < 8) { + orderId = String.format("%08d", Integer.parseInt(orderId)); + } + + // 判断并补全 mainId + if (mainId != null && mainId.length() < 8) { + mainId = String.format("%08d", Integer.parseInt(mainId)); + } + order.setProcureCode(orderId); + order.setSiteCode(sapPurchaseOrderQuery1.get("werks")); + //order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 + order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); + order.setMaterialDesc(sapPurchaseOrderQuery1.get("matnrName")); + order.setActive("1"); + List orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order); + if (orderList.size() > 0) { + continue; + } + order.setUserDefined5(mainId); + order.setPlanNumber(new BigDecimal(sapPurchaseOrderQuery1.get("thisDeliNum"))); + order.setUnit(sapPurchaseOrderQuery1.get("unit")); + order.setSupplierCode(sapPurchaseOrderQuery1.get("lifnr")); + //order.setUserDefined9(sapPurchaseOrderQuery1.get("zmenge")); + // order.setUserDefined10(sapPurchaseOrderQuery1.get("elikz")); + // order.setUserDefined11(sapPurchaseOrderQuery1.get("eindt")); + order.setCreateBy(odsProcureOrder.getCreateBy()); + order.setPlanDate(new Date()); + order.setOrderStatus("0"); + //order.setID(IdUtils.fastSimpleUUID()); + order.setCreateDate(new Date()); + odsProcureOrderMapper.insertOdsProcureOrder(order); + } + + } + return AjaxResult.success(); + } + public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle) { // 定义请求的URL地址 String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundByPallet";