From 2d7d562cdde6d4cf059e6e24f60ea4cf8f9c18d4 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 10 Oct 2024 15:29:14 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E8=BF=87=E8=B4=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B93=E5=92=8C=E5=8A=A0=E9=80=81=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 14 +++ .../com/op/wms/domain/OdsProcureOutOrder.java | 13 +++ .../wms/service/IOdsProcureOrderService.java | 2 + .../impl/OdsProcureOrderServiceImpl.java | 93 +++++++++++++++++++ 4 files changed, 122 insertions(+) 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 47d70f4b..f341c680 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 @@ -269,6 +269,20 @@ public class WmsToWCSmissionController { String result = odsProcureOrderService.NewConMaterialOutSC(orderList); return success(result); } + + /** + * 生产领料--新确认出库 + * + * @param orderList + * @return + */ + @PostMapping("/NewConMaterialOutSCNew") + public AjaxResult NewConMaterialOutSCNew(@RequestParam("orderList") List orderList,@RequestParam("gzList") List gzList) { + String result = odsProcureOrderService.NewConMaterialOutSCNew(orderList,gzList); + return success(result); + } + + /** * 生产领料--托盘数据查询 * diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java index 08c2dedc..7fc26536 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java @@ -92,6 +92,19 @@ public class OdsProcureOutOrder extends BaseEntity { */ @Excel(name = "生成订单") private String produceCode; + /** + * 生成订单 + */ + + private String gzTem;//是否过账 + + public String getGzTem() { + return gzTem; + } + + public void setGzTem(String gzTem) { + this.gzTem = gzTem; + } /** * 型号编码 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 ccb031a7..61e2fc8b 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 @@ -137,4 +137,6 @@ public interface IOdsProcureOrderService { String getIdCardListTH(OdsProcureOrder odsProcureOrder); String addReturnSC(List orderList); + + String NewConMaterialOutSCNew(List orderList, List gzList); } 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 ecc21fdb..04b26fd8 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 @@ -2093,6 +2093,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn(); wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID()); wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode()); + wmsRawOrderIn.setOrderNo(order1.getUserDefined5());//送货单 wmsRawOrderIn.setDnNo(receiptNoCode); wmsRawOrderIn.setPoNo(odsProcureOrder.getProcureCode()); wmsRawOrderIn.setPoLine(odsProcureOrder.getUserDefined3()); @@ -2395,6 +2396,98 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return result; } + @Override + public String NewConMaterialOutSCNew(List orderList, List gzList) { + String result="操作成功"; + String factoryCode = orderList.get(0).getFactoryCode(); + DynamicDataSourceContextHolder.push("ds_" + factoryCode); + for (OdsProcureOutOrder odsProcureOutOrder : + orderList) { + //领料单，物料编号，领料单批次，物料名称，托盘号，出库数量，库位号， + String produceCode= odsProcureOutOrder.getProduceCode();//生产领料单号 + String createBy= odsProcureOutOrder.getCreateBy();//操作人 + String mateOrderInSnId= odsProcureOutOrder.getMateOrderInSnId(); + String waCode= odsProcureOutOrder.getWaCode(); + String whCode= odsProcureOutOrder.getWhCode(); + String wlCode= odsProcureOutOrder.getWlCode(); + String sn= odsProcureOutOrder.getSn(); + String materialCode= odsProcureOutOrder.getMaterialCode(); + String materialDesc= odsProcureOutOrder.getMaterialDesc(); + BigDecimal amount= odsProcureOutOrder.getAmount();//数量 + String userDefined1= odsProcureOutOrder.getUserDefined1();//单位 + String userDefined2= odsProcureOutOrder.getUserDefined2();//批次 + WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = wmsOdsMateStorageNewsSnMapper.selectWmsOdsMateStorageNewsSnByMateOrderInSnIdk(mateOrderInSnId); + //wms_raw_mission_out--保存 + //ods_procure_out_order--修改 + WCSInventoryPlan wcsInventoryPlan = new WCSInventoryPlan(); + wcsInventoryPlan.setSku(odsProcureOutOrder.getMaterialCode()); + // WmsOdsMateStorageNews wmsOdsMateStorageNews = wmsOdsMateStorageNewsMapper.selectBaseProductByCode(wcsInventoryPlan); + OdsProcureOutOrder order = new OdsProcureOutOrder(); + order.setProduceCode(produceCode);//领料单 + order.setMaterialCode(materialCode);// + order.setMaterialDesc(materialDesc); + order.setUserDefined1(userDefined2);//批次 + order.setUserDefined2(whCode); + order.setUserDefined3(wlCode); + order.setSn(sn); + order.setPlanNumber(amount); + order.setLocCode(waCode);//库区 + order.setID(IdUtils.fastSimpleUUID()); + order.setUnit(userDefined1); + order.setFactoryCode(factoryCode); + order.setActive("1"); + order.setCreateBy(createBy); + order.setCreateDate(new Date()); + //order.setSiteCode(factoryCode); + odsProcureOutOrderMapper.insertWmsRawMissionOut(order); + OdsProcureOutOrder odsProcureOutOrder1=new OdsProcureOutOrder(); + odsProcureOutOrder1.setProduceCode(produceCode); + odsProcureOutOrder1.setMaterialCode(materialCode); + List odsProcureOutOrders = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder1); + OdsProcureOutOrder order1= odsProcureOutOrders.get(0); + BigDecimal realityNumber1 = order1.getOutNumber();//累出库数 + BigDecimal realityNumber = order1.getPlanNumber();//计划 + BigDecimal planNumber = amount;//本次实际数量 + BigDecimal tem = realityNumber1.add(planNumber); + if (tem.compareTo(realityNumber)>= 0) { + order1.setOrderStatus("3"); + } else { + order1.setOrderStatus("2"); + } + order1.setOutNumber(tem); + odsProcureOutOrderMapper.updateWmsOdsProcureOutOrder(order1);//订单修改 + //明细 +// BigDecimal temk= wmsOdsMateStorageNewsSn.getAmount().subtract(amount); + wmsOdsMateStorageNewsSn.setOutNumber(amount); + wmsOdsMateStorageNewsSn.setLastModifiedBy(createBy); + wmsOdsMateStorageNewsSnMapper.updateWmsOdsMateStorageNewsSnAddoutNumber(wmsOdsMateStorageNewsSn);//库存明细 + WmsOdsEmStorageNews wmsOdsEmStorageNews = new WmsOdsEmStorageNews(); + wmsOdsEmStorageNews.setWhCode(wmsOdsMateStorageNewsSn.getWhCode());//仓库编码 + wmsOdsEmStorageNews.setWlCode(wmsOdsMateStorageNewsSn.getWlCode());//库位编码 + wmsOdsEmStorageNews.setWaCode(wmsOdsMateStorageNewsSn.getWaCode()); + wmsOdsEmStorageNews.setProductBatch(wmsOdsMateStorageNewsSn.getUserDefined2()); + wmsOdsEmStorageNews.setMaterialCode(wmsOdsMateStorageNewsSn.getMaterialCode()); + wmsOdsEmStorageNews.setAmount(odsProcureOutOrder.getPlanNumber());//库存 + wmsOdsEmStorageNews.setLastModifiedBy(createBy); + wmsOdsMateStorageNewsSnMapper.updatekdd(wmsOdsEmStorageNews);//库存调整 + } + // + OdsProcureOutOrder order=new OdsProcureOutOrder(); + + List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByOrderStatus(order); + if (orderList1.size()>0){ + OutboundPostingzcSAPGY(orderList1); + } + if (gzList.size()>0) { + OutboundPostingzcSAPGY(gzList); +// List odsProcureOutOrders = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByIDs(gzList); +// if (odsProcureOutOrders.size()>0){ +// OutboundPostingzcSAPGY(odsProcureOutOrders); +// } + } + return result; + } + // @Override // public String addReturnSC(List orderList) { // String factoryCode = orderList.get(0).getFactoryCode();