diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java index a7e5b602..317cb951 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOrderController.java @@ -257,13 +257,13 @@ public class OdsProcureOrderController extends BaseController { } /** * 生产领料--托盘数据查询 - * @param wmsDesignatedPalle + * @param wmsOdsMateStorageNewsSn * @return */ - @PostMapping("/ProductionMaterialRequisition") - public AjaxResult ProductionMaterialRequisition(@RequestBody WMSDesignatedPalle wmsDesignatedPalle) { -// Integer result= odsProcureOrderService.ProductionMaterialRequisitionAdd(orderList); - return success(); + @PostMapping("/ProductionMaterialRequisitionsn") + public AjaxResult ProductionMaterialRequisitionsn(@RequestBody WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn) { + WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn1= odsProcureOrderService.ProductionMaterialRequisitionsn(wmsOdsMateStorageNewsSn); + return success(wmsOdsMateStorageNewsSn1); } 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 b92cc909..1af86c7b 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 @@ -150,15 +150,7 @@ public WmsToWCSDTO packingMaterialsOutBoundCompleted(@RequestBody WmsToWCSDTO wc @PostMapping("/ProductionMaterialRequisition") public AjaxResult ProductionMaterialRequisition(@RequestBody OdsProcureOutOrder odsProcureOutOrder) { List result= odsProcureOrderService.ProductionMaterialRequisition(odsProcureOutOrder); - return success(result); } - /** - * 采购订单接口 - */ - @PostMapping("/sapPurchaseOrderSync") - public R sapPurchaseOrderSync(@RequestBody SapBackflushMPQuery sapPurchaseOrderQuery){ - return odsProcureOrderService.sapPurchaseOrderSync(sapPurchaseOrderQuery); - } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/SapBackflushMPQuery.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/SapBackflushMPQuery.java deleted file mode 100644 index 93ab6efa..00000000 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/SapBackflushMPQuery.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.op.wms.domain; - -import java.io.Serializable; - -/** - * 反冲类型的领料过账接口 - * auth YangWL - * - * MATNR CHAR 18 0 物料号 必填 - * PLANT CHAR 4 0 工厂 必填 - * GR_RCPT CHAR 12 0 收货方/运达方 选填 - * LGORT CHAR 4 0 库存地点 必填 - * UMLGO CHAR 4 0 收货/发货库存地点 选填 - * QUANTITY QUAN 13 3 数量 必填 - * MEINS UNIT 3 0 条目单位 必填 - * BATCH CHAR 10 0 批号 必填 - * MOVE_BATCH CHAR 10 0 收货/发货批量 选填 - */ - - -public class SapBackflushMPQuery implements Serializable { - /** - * S_EBELN 采购订单号 - * S_EBELP 行项目 - * S_MATNR 物料号 - * S_PWERK 工厂 - */ - private String ebeln; - private String ebelp; - private String matnr; - private String pwerk; - private String factoryCode;// - - public String getFactoryCode() { - return factoryCode; - } - - public void setFactoryCode(String factoryCode) { - this.factoryCode = factoryCode; - } - - public String getEbeln() { - return ebeln; - } - - public void setEbeln(String ebeln) { - this.ebeln = ebeln; - } - - public String getEbelp() { - return ebelp; - } - - public void setEbelp(String ebelp) { - this.ebelp = ebelp; - } - - public String getMatnr() { - return matnr; - } - - public void setMatnr(String matnr) { - this.matnr = matnr; - } - - public String getPwerk() { - return pwerk; - } - - public void setPwerk(String pwerk) { - this.pwerk = pwerk; - } -} 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 7e2c35aa..3a0b9173 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 @@ -75,7 +75,7 @@ public interface IOdsProcureOrderService { OrderLine addPurchaseOrderOutbound(OrderLine orderLine); - R sapPurchaseOrderSync(SapBackflushMPQuery sapPurchaseOrderQuery); + void TraystatusUpdate(WMSTraystatus wmsTraystatus); @@ -86,4 +86,6 @@ public interface IOdsProcureOrderService { List ProductionMaterialRequisition(OdsProcureOutOrder odsProcureOutOrder); Integer ProductionMaterialRequisitionAdd(List orderList); + + WmsOdsMateStorageNewsSn ProductionMaterialRequisitionsn(WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn); } 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 599ea2ea..9120c4c1 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 @@ -13,12 +13,11 @@ import java.util.Date; import java.util.List; -import com.op.common.core.constant.Constants; + import com.op.common.core.domain.R; -import com.op.common.core.utils.StringUtils; -import com.op.common.core.web.domain.AjaxResult; + import okhttp3.OkHttpClient; import okhttp3.MediaType; import okhttp3.RequestBody; @@ -206,6 +205,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsOdsMateStorageNewsSn.setAmount(wmsRawOrderInSn.getAmount()); wmsOdsMateStorageNewsSn.setCreateBy(wmsRawOrderInSn.getCreateBy()); wmsOdsMateStorageNewsSn.setGmtCreate(new Date()); + wmsOdsMateStorageNewsSn.setUserDefined2(wmsRawOrderInSn.getUserDefined2());//批次 wmsOdsMateStorageNewsSn.setFactoryCode(wmsRawOrderInSn.getFactoryCode()); wmsOdsMateStorageNewsSn.setSapFactoryCode(wmsRawOrderInSn.getFactoryCode()); wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn); @@ -262,14 +262,16 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { public OrderLine addPurchaseOrderOutbound(OrderLine orderLine) { //自己生成行项目,,批次号 List orderList= orderLine.getList(); - + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH:mm:ss"); + Date date = new Date(); + String formattedDate = dateFormat.format(date); //根据订单号查询对应的最大批次号 Integer orderItem = 0; for (OrderLine orderLine1: orderList) { orderItem++; orderLine1.setOrderLineNo(String.format("%05d", orderItem)); - orderLine1.setBatchNo("00001"); + orderLine1.setBatchNo(formattedDate); } String ken=orderLine.getKen(); if("2".equals(ken)){ @@ -318,100 +320,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return orderLine; } - @Override - public R sapPurchaseOrderSync(SapBackflushMPQuery sapPurchaseOrderQuery) { - DynamicDataSourceContextHolder.push("ds_" + sapPurchaseOrderQuery.getFactoryCode()); -// try { -// // 获取调用 RFC 函数对象 -// //获取连接 -// //JCoDestination dest = SAPConnUtils.connect(); -// JCoRepository repository = dest.getRepository(); -// JCoFunction func = repository.getFunction("ZMES_GET_PROCURE"); -// JCoParameterList jCoParameterList= func.getTableParameterList(); -// System.out.println(jCoParameterList); -// if (func == null) { -// throw new RuntimeException("Function does not exist in SAP"); -// } -// /** S_EBELN 采购订单号 -// * S_EBELP 行项目 -// * S_MATNR 物料号 -// * S_PWERK 工厂 -// */ -// if (!StringUtils.isNull(sapPurchaseOrderQuery.getEbeln())){ -// JCoTable S_EBELN = func.getTableParameterList().getTable("S_EBELN"); -// S_EBELN.appendRow(); -// S_EBELN.setValue(Constants.SIGN, "I"); -// S_EBELN.setValue(Constants.OPTION, "EQ"); -// S_EBELN.setValue(Constants.LOW, sapPurchaseOrderQuery.getEbeln()); -// } -//// if (!StringUtils.isNull(sapPurchaseOrderQuery.getEbeln())){ -//// JCoTable S_EBELN = func.getTableParameterList().getTable("S_EBELP"); -//// S_EBELN.appendRow(); -//// S_EBELN.setValue(Constants.SIGN, "I"); -//// S_EBELN.setValue(Constants.OPTION, "EQ"); -//// S_EBELN.setValue(Constants.LOW, sapPurchaseOrderQuery.getEbeln()); -//// } -//// if (!StringUtils.isNull(sapPurchaseOrderQuery.getMatnr())){ -//// JCoTable S_MATNR = func.getTableParameterList().getTable("S_MATNR"); -//// S_MATNR.appendRow(); -//// S_MATNR.setValue(Constants.SIGN, "I"); -//// S_MATNR.setValue(Constants.OPTION, "EQ"); -//// S_MATNR.setValue(Constants.LOW, sapPurchaseOrderQuery.getMatnr()); -//// } -//// -//// if (!StringUtils.isNull(sapPurchaseOrderQuery.getPwerk())){ -//// JCoTable S_PWERK = func.getTableParameterList().getTable("S_PWERK"); -//// S_PWERK.appendRow(); -//// S_PWERK.setValue(Constants.SIGN, "I"); -//// S_PWERK.setValue(Constants.OPTION, "EQ"); -//// S_PWERK.setValue(Constants.LOW, sapPurchaseOrderQuery.getPwerk()); -//// } -// func.execute(dest);//执行调用函数 -// // 获取 内表 - LT_PROCURE -// JCoTable maraTable = func.getTableParameterList().getTable("LT_PROCURE"); -// JCoRecordMetaData metaData = maraTable.getRecordMetaData(); -// System.out.println("###" + metaData.toString()); -// -// List sapCustomList=new ArrayList<>(); -// for (int i = 0; i orderList) { //修改对应订单－－插入对应出库托盘数据数据 - +// for (OdsProcureOutOrder odsProcureOutOrder: +// orderList) { +// //领料单，物料编号，物料名称，托盘号，出库数量，库位号， +// odsProcureOutOrder. +// } return null; } + @Override + public WmsOdsMateStorageNewsSn ProductionMaterialRequisitionsn(WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn) { + DynamicDataSourceContextHolder.push("ds_" + wmsOdsMateStorageNewsSn.getFactoryCode()); + WmsToWCSDTO wmsToWCSDTO=new WmsToWCSDTO(); + wmsToWCSDTO.setRfidNo(wmsOdsMateStorageNewsSn.getSn()); + WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn1= wmsOdsMateStorageNewsSnMapper.selectwmsRfidNotwo(wmsToWCSDTO); + return wmsOdsMateStorageNewsSn1; + } + public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle){ // 定义请求的URL地址 String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundByPallet";