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 204d1ef57..5cab0e909 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 @@ -54,6 +54,10 @@ public class OdsProcureOrderController extends BaseController { public AjaxResult getIdCardList(@RequestBody OdsProcureOrder odsProcureOrder) { return success(odsProcureOrderService.getIdCardList(odsProcureOrder)); } + @PostMapping("/getIdCardListTH") + public AjaxResult getIdCardListTH(@RequestBody OdsProcureOrder odsProcureOrder) { + return success(odsProcureOrderService.getIdCardListTH(odsProcureOrder)); + } /**获补打标识卡**/ @PostMapping("/getIdCardListDA") public AjaxResult getIdCardListDA(@RequestBody OdsProcureOrder odsProcureOrder) { diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java index 4d5e8ee8d..5537ed77c 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java @@ -140,4 +140,11 @@ public class OdsProcureOutOrderController extends BaseController { List list = odsProcureOutOrderService.listReturnBC(odsProcureOutOrder); return getDataTable(list); } + + //退货单打印 + @PostMapping("/listReturnDY") + public AjaxResult listReturnDY( OdsProcureOutOrder odsProcureOutOrder) { + List list = odsProcureOutOrderService.listReturnDY(odsProcureOutOrder); + return success(list); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java index 6fa1f95c0..16fa584ca 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOrder.java @@ -30,8 +30,17 @@ public class OdsProcureOrder extends BaseEntity { /** * 已登记数量 */ + private BigDecimal returnNumber; -// 托盘数量 + public BigDecimal getReturnNumber() { + return returnNumber; + } + + public void setReturnNumber(BigDecimal returnNumber) { + this.returnNumber = returnNumber; + } + + // 托盘数量 private BigDecimal palletNum; public BigDecimal getPalletNum() { 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 6344db953..08c2dedc5 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 @@ -50,6 +50,15 @@ public class OdsProcureOutOrder extends BaseEntity { public BigDecimal getQty() { return qty; } + private String selectedBatch; + + public String getSelectedBatch() { + return selectedBatch; + } + + public void setSelectedBatch(String selectedBatch) { + this.selectedBatch = selectedBatch; + } public void setQty(BigDecimal qty) { this.qty = qty; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java index b3b2f70b7..62666cb0e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOrderMapper.java @@ -94,4 +94,12 @@ public interface OdsProcureOrderMapper { List getIdCardByIdList(@Param("storageId")String storageId); + + OdsProcureOrder selectOdsProcureOrderCardTL(OdsProcureOrder odsProcureOrder); + + OdsProcureOrder selectWMSOdsProcureReturnOrderByID(String id); + + List getIdCardListTH(OdsProcureOrder order); + + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java index 57e93ba2e..9993d0e7e 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java @@ -3,6 +3,7 @@ package com.op.wms.mapper; import java.util.List; import com.op.system.api.domain.sap.SapMaterialPosting; +import com.op.wms.domain.OdsProcureOrder; import com.op.wms.domain.OdsProcureOutOrder; import com.op.wms.domain.WmsOdsEmStorageNews; import com.op.wms.domain.WmsOdsMateStorageNews; @@ -138,4 +139,6 @@ public interface OdsProcureOutOrderMapper { void insertWmsOdsProcureReturnOrder(OdsProcureOutOrder odsProcureOutOrder1); void updateOdsProcureOutOrderByPcAndMc(OdsProcureOutOrder order); + + void updateWmsOdsProcureReturnOrderByID(OdsProcureOrder order1); } 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 063e22abb..ccb031a77 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 @@ -131,4 +131,10 @@ public interface IOdsProcureOrderService { void OutboundPostingzcSAP(List orderList); String addOrderCardX(List orderList); + + OdsProcureOrder selectOrderCardTL(OdsProcureOrder odsProcureOrder); + + String getIdCardListTH(OdsProcureOrder odsProcureOrder); + + String addReturnSC(List orderList); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java index f5ee10f7c..a3fa683c6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java @@ -74,4 +74,6 @@ public interface IOdsProcureOutOrderService { List listReturnBC(OdsProcureOutOrder odsProcureOutOrder); List listReturnSC(OdsProcureOutOrder odsProcureOutOrder); + + List listReturnDY(OdsProcureOutOrder odsProcureOutOrder); } 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 e3a4c0f77..29857f883 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 @@ -2128,6 +2128,405 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return result1; } + @Override + public OdsProcureOrder selectOrderCardTL(OdsProcureOrder odsProcureOrder) { + //送货单，采购单，行项目，物料编码，物料名称，工厂号，托盘，状态，实际收货 + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + OdsProcureOrder order= odsProcureOrderMapper.selectOdsProcureOrderCardTL(odsProcureOrder); + return order; + } + + @Override + @DS("#header.poolName") + public String getIdCardListTH(OdsProcureOrder odsProcureOrder) { + // DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + List dtos = new ArrayList<>(); + OdsProcureOrder order=odsProcureOrderMapper.selectWMSOdsProcureReturnOrderByID(odsProcureOrder.getID()); + //根据采购单获取一托盘要装多少 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + // 获取当前日期和时间 + Date now = new Date(); + // 将当前日期格式化为指定格式的字符串 + String formattedDate = dateFormat.format(now); + BaseProductAttached baseProductAttached=new BaseProductAttached(); + String trimmedMaterialCode = order.getMaterialCode().substring(7); + baseProductAttached.setProductCode(trimmedMaterialCode); + List baseProductAttacheds= baseProductAttachedMapper.selectBaseProductAttachedList(baseProductAttached); + if (baseProductAttacheds.size()==0){ + //没有配置附属信息 + return "没有配置附属信息"; + } + String name = odsProcureOrderMapper.selectBaseSupplier(order); + order.setSupplierName(name); + List dtos0= odsProcureOrderMapper.getIdCardListTH(order); + if(dtos0.size()==0){ + //说明没生成过标识卡 + OdsProcureOrder pw = new OdsProcureOrder(); + int i = 1; + String palletNum = baseProductAttacheds.get(0).getPalletNum(); + Date nowDate = DateUtils.getNowDate(); + + if(palletNum!=null){ + BigDecimal pall = order.getPlanNumber(); + BigDecimal pn = new BigDecimal(palletNum); + while(pall.compareTo(BigDecimal.ZERO)>0){ + pw = new OdsProcureOrder(); + pw.setSiteCode(order.getSiteCode()); + pw.setProcureCode(order.getProcureCode()); + pw.setUserDefined3(order.getUserDefined3());//行项目 + pw.setMaterialCode(order.getMaterialCode()); + pw.setMaterialDesc(order.getMaterialDesc()); + pw.setPlanNumber(pn); + pw.setSupplierCode(order.getSupplierCode()); + pw.setSupplierName(order.getSupplierName()); + pw.setUserDefined8("2");//2是退货单 + pw.setUserDefined7(order.getUserDefined5()); + pw.setUserDefined10("0");//标识卡状态0是未收货的 + pw.setUserDefined11(formattedDate);//2024-09-25 + pw.setUserDefined4(odsProcureOrder.getID()); + pw.setUnit(order.getUnit()); + if(pall.compareTo(pn)<0) {//最后一托盘 + pw.setPlanNumber(pall); + }else{ + pw.setPlanNumber(pn); + } + pw.setCardNum(String.valueOf(i++)); + // String dateString = pw.getUserDefined11().replace("-", ""); + pw.setUserDefined1(pw.getProcureCode()+"-"+odsProcureOrder.getID()+"-"+pw.getCardNum());//采购单+id+ + pw.setCreateTime(nowDate); + pw.setActive("1"); + dtos.add(pw); + pall = pall.subtract(pn); + } + } + if(!CollectionUtils.isEmpty(dtos)){ + odsProcureOrderMapper.addBatchPallet(dtos); + } + }else{ + dtos.addAll(dtos0); + } + for (OdsProcureOrder order1: + dtos ) { + String materialCode= order1.getMaterialCode();//000000040000004873 + materialCode = materialCode.replaceFirst("^0{7}", ""); // 只替换开头的7个0 + order1.setMaterialCode(materialCode); + } + String msg= dayin(dtos); + return msg; + } + + @Override + public String addReturnSC(List orderList) { + String result="操作成功"; + String factoryCode = orderList.get(0).getFactoryCode(); + DynamicDataSourceContextHolder.push("ds_" + factoryCode); + for (OdsProcureOutOrder odsProcureOutOrder : + orderList) { + //领料单，物料编号，领料单批次，物料名称，托盘号，出库数量，库位号， + String userDefined3= odsProcureOutOrder.getUserDefined3();//退料单id + OdsProcureOrder order1= odsProcureOrderMapper.selectWMSOdsProcureReturnOrderByID(userDefined3); + String createBy= odsProcureOutOrder.getCreateBy();//操作人 + String userDefined6= odsProcureOutOrder.getUserDefined6();//标识卡 + 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.getPlanNumber();//数量 + String userDefined1= order1.getUnit();//单位 + String userDefined2= odsProcureOutOrder.getUserDefined5();//批次 + //接下来我就要调整库存--修改订单 + + BigDecimal returnNumber= order1.getReturnNumber(); + order1.setReturnNumber(returnNumber.add(amount)); + if(order1.getPlanNumber().compareTo(order1.getReturnNumber())<=0){ + order1.setOrderStatus("3"); + }else { + order1.setOrderStatus("2"); + } + odsProcureOutOrderMapper.updateWmsOdsProcureReturnOrderByID(order1); + OdsProcureOrder order =new OdsProcureOrder(); + order.setUserDefined6(userDefined6); + odsProcureOrderMapper.updateodsProcureOrderCard(order); + //库存 + //收货 + WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = new WmsOdsMateStorageNewsSn(); + wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID()); + wmsOdsMateStorageNewsSn.setWhCode(odsProcureOutOrder.getWhCode());//仓库编码 + wmsOdsMateStorageNewsSn.setWaCode(odsProcureOutOrder.getWaCode()); + wmsOdsMateStorageNewsSn.setWlCode(odsProcureOutOrder.getSn());//库位编码- + wmsOdsMateStorageNewsSn.setMaterialCode(odsProcureOutOrder.getMaterialCode()); + wmsOdsMateStorageNewsSn.setMaterialDesc(odsProcureOutOrder.getMaterialDesc()); + wmsOdsMateStorageNewsSn.setSn(odsProcureOutOrder.getSn()); + wmsOdsMateStorageNewsSn.setAmount(odsProcureOutOrder.getPlanNumber()); + wmsOdsMateStorageNewsSn.setCreateBy(odsProcureOutOrder.getCreateBy()); + wmsOdsMateStorageNewsSn.setGmtCreate(new Date()); + wmsOdsMateStorageNewsSn.setUserDefined2(userDefined2);//批次 + wmsOdsMateStorageNewsSn.setUserDefined1("RK"); + wmsOdsMateStorageNewsSn.setUserDefined3("0");//0是暂收，1是真收 + wmsOdsMateStorageNewsSn.setFactoryCode(factoryCode); + wmsOdsMateStorageNewsSn.setSapFactoryCode(factoryCode); + wmsOdsMateStorageNewsSn.setActiveFlag("1"); + wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn); + //修改库存 + //２，修改库存－－－／加库存数量-/-冻结数量 + WmsOdsEmStorageNews wmsOdsEmStorageNews = new WmsOdsEmStorageNews(); + wmsOdsEmStorageNews.setWhCode(odsProcureOutOrder.getWhCode());//仓库编码 + wmsOdsEmStorageNews.setWlCode(odsProcureOutOrder.getSn());//库位编码 + wmsOdsEmStorageNews.setWaCode(odsProcureOutOrder.getWaCode());//库位编码 + wmsOdsEmStorageNews.setMaterialCode(odsProcureOutOrder.getMaterialCode()); + wmsOdsEmStorageNews.setUserDefined2(userDefined2);//批次 + wmsOdsEmStorageNews.setAmount(odsProcureOutOrder.getPlanNumber()); + //添加库存--这个要有个判断有没有这个库存如果没有的话，就插入 + WmsOdsMateStorageNews wmsOdsMateStorageNews = wmsOdsMateStorageNewsMapper.selectByWhCodeAndMate(wmsOdsEmStorageNews); + if (wmsOdsMateStorageNews == null) { + WmsOdsMateStorageNews wmsOdsMateStorageNews1 = new WmsOdsMateStorageNews(); + wmsOdsMateStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); + wmsOdsMateStorageNews1.setWhCode(odsProcureOutOrder.getWhCode()); + wmsOdsMateStorageNews1.setWlCode(odsProcureOutOrder.getSn()); + wmsOdsMateStorageNews1.setWaCode(odsProcureOutOrder.getWaCode()); + wmsOdsMateStorageNews1.setAmount(odsProcureOutOrder.getPlanNumber()); + wmsOdsMateStorageNews1.setStorageAmount(odsProcureOutOrder.getPlanNumber()); + wmsOdsMateStorageNews1.setMaterialCode(odsProcureOutOrder.getMaterialCode()); + wmsOdsMateStorageNews1.setMaterialDesc(odsProcureOutOrder.getMaterialDesc()); + wmsOdsMateStorageNews1.setStorageType("BC"); + wmsOdsMateStorageNews1.setCreateBy(odsProcureOutOrder.getCreateBy()); + wmsOdsMateStorageNews1.setGmtCreate(new Date()); + wmsOdsMateStorageNews1.setActiveFlag("1"); + wmsOdsMateStorageNews1.setFactoryCode(factoryCode); + wmsOdsMateStorageNews1.setSapFactoryCode(factoryCode); + wmsOdsMateStorageNews1.setUserDefined1(userDefined1);//单位 + wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews1); + } else { + wmsOdsMateStorageNewsSnMapper.updateAdd(wmsOdsEmStorageNews); + } + } +// OdsProcureOutOrder order=new OdsProcureOutOrder(); +// List orderList1 = odsProcureOutOrderMapper.selectWmsOdsProcureOutOrderByOrderStatus(order); +// if (orderList1.size()>0){ +// OutboundPostingzcSAPGY(orderList1); +// } + return result; + } + +// @Override +// public String addReturnSC(List orderList) { +// String factoryCode = orderList.get(0).getFactoryCode(); +// // String receiptNoCode = orderList.get(0).getReceiptNoCode(); +// //现在是传了个list标识卡集合 +// String result1="操作成功"; +// DynamicDataSourceContextHolder.push("ds_" + factoryCode); +// //如果这样的话，就区分出来单子和对应的物料。然后根据集合放入暂收集合中 +// List orderList1=new ArrayList<>();// +// for (OdsProcureOrder order: +// orderList) { +// OdsProcureOrder order1= odsProcureOrderMapper.selectWMSOdsProcureReturnOrderByID(order.getUserDefined3()); +// order.setUserDefined5(order1.getUserDefined5());//批次 +// //order.setPoLine(order1.getUserDefined3()); +// order.setUnit(order1.getUnit()); +// order.setID(order1.getID()); +// if (orderList1.size()>0){ +// String tem="0"; +// for (OdsProcureOrder odsProcureOrder:orderList1){ +// if (odsProcureOrder.getID().equals(order1.getID())){ +// tem="1";//已经保存对应订单了 +// } +// } +// if (tem.equals("0")){ +// orderList1.add(order1); +// } +// }else { +// orderList1.add(order1); +// } +// } +// for (OdsProcureOrder odsProcureOrder: +// orderList1) { +// //单子 +// BigDecimal returnNumber=new BigDecimal("0"); +// for ( OdsProcureOrder order : +// orderList) { +// if (order.getID().equals(odsProcureOrder.getID())){ +// returnNumber=returnNumber.add(order.getPlanNumber()); +// } +// } +// odsProcureOrder.setReturnNumber(returnNumber); +// } +// Map paramMap=new HashMap<>(); +// List mapList = new ArrayList<>(); +// for (OdsProcureOrder order : +// orderList1) { +// paramMap.put("EBELN",order.getProcureCode());// +// paramMap.put("EBELP",order.getUserDefined3());//行项目 +// paramMap.put("MATNR",order.getMaterialCode());//物料 +// paramMap.put("WERKS",order.getSiteCode());//工厂 +// paramMap.put("QUANTITY",order.getCzNumber());//数量 +// paramMap.put("P_LFSNR",order.getUserDefined5());//送 +// mapList.add(paramMap); +// } +// R result2 = remoteSapService.temporarilyCollected(mapList); +// int code = result2.getCode(); +// if (code == 200){ +// //对应采购单的标识卡 +// for (OdsProcureOrder order1k: +// orderList) { +// //标识卡信息 +// //wms_raw_order_in_sn +// WmsRawOrderInSn wmsRawOrderInSn = new WmsRawOrderInSn(); +// wmsRawOrderInSn.setRawOrderInSnId(IdUtils.fastSimpleUUID()); +// wmsRawOrderInSn.setUserDefined1("1");//１是收货，２是入库 +// wmsRawOrderInSn.setUserDefined2(order1k.getUserDefined7());//批次 +// wmsRawOrderInSn.setWhCode(order1k.getWhCode());//厂库编号 +// wmsRawOrderInSn.setWaCode(order1k.getWaCode()); +// wmsRawOrderInSn.setWlCode(order1k.getSn());//库位设置为托盘 +// wmsRawOrderInSn.setPoNo(order1k.getProcureCode());//采购单号 +// wmsRawOrderInSn.setPoLine(order1k.getUserDefined3());//行项目 +// wmsRawOrderInSn.setMaterialCode(order1k.getMaterialCode()); +// wmsRawOrderInSn.setMaterialDesc(order1k.getMaterialDesc()); +// wmsRawOrderInSn.setAmount(order1k.getPlanNumber());//实际输入数量 +// wmsRawOrderInSn.setFactoryCode(order1k.getFactoryCode()); +// wmsRawOrderInSn.setCreateBy(order1k.getCreateBy()); +// wmsRawOrderInSn.setGmtCreate(new Date()); +// wmsRawOrderInSn.setActiveFlag("1"); +// wmsRawOrderInSn.setUserDefined4(order1k.getUnit());//单位 +// wmsRawOrderInSn.setSn(order1k.getSn());//托盘号 +// wmsRawOrderInSn.setFactoryCode(order1k.getFactoryCode()); +// wmsRawOrderInSn.setUserDefined3(order1k.getID()); +// wmsRawOrderInSn.setUserDefined5(order1k.getReceiptNoCode()); +// //wmsRawOrderInSn.setd +// wmsRawOrderInSn.setUserDefined6(order1k.getUserDefined6());//标识码绑定 +// wmsRawOrderInSnMapper.insertWmsRawOrderInSn(wmsRawOrderInSn); +// //标识码绑定 +// if (order1k.getUserDefined6()!=null){ +// WmsLogotypeTable wmsLogotypeTable=new WmsLogotypeTable(); +// wmsLogotypeTable.setId(IdUtils.fastSimpleUUID()); +// wmsLogotypeTable.setLogotype(order1k.getUserDefined6()); +// wmsLogotypeTable.setSn(order1k.getSn()); +// wmsLogotypeTable.setActiveFlag("1"); +// wmsRawOrderInSnMapper.insertWmsLogotypeTable(wmsLogotypeTable); +// } +// +// odsProcureOrderMapper.updateodsProcureOrderCard(order1k); +// } +// Map map = new HashMap(); +// map = (Map) result2.getData(); +// String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT"); +// String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); +// for (OdsProcureOrder odsProcureOrder: +// orderList1) { +// BigDecimal planNumber= odsProcureOrder.getPlanNumber(); +// ;//操作数量 +// odsProcureOrder.setOrderStatus("1"); +// BigDecimal result = odsProcureOrder.getRealityNumber().add(odsProcureOrder.getCzNumber()); +// System.out.println(result); +// if (result.compareTo(planNumber)== 0) { +// odsProcureOrder.setOrderStatus("2"); +// } +// odsProcureOrder.setPlanNumber(odsProcureOrder.getCzNumber()); +// odsProcureOrderMapper.updateRealityNuById(odsProcureOrder); +// } +// for (OdsProcureOrder odsProcureOrder: +// orderList1) { +// //标识卡记录已经录入，订单已经修改完成 +// OdsProcureOrder order1 = odsProcureOrderMapper.selectOdsProcureOrderByID(odsProcureOrder.getID()); +// order1.setSapTempInfor(result2.getMsg()); +// WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn(); +// wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID()); +// wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode()); +// wmsRawOrderIn.setDnNo(receiptNoCode); +// wmsRawOrderIn.setPoNo(odsProcureOrder.getProcureCode()); +// wmsRawOrderIn.setPoLine(odsProcureOrder.getUserDefined3()); +// wmsRawOrderIn.setMaterialCode(odsProcureOrder.getMaterialCode()); +// wmsRawOrderIn.setMaterialDesc(odsProcureOrder.getMaterialDesc()); +// wmsRawOrderIn.setRequestAmount(odsProcureOrder.getCzNumber()); +// wmsRawOrderIn.setUnit(odsProcureOrder.getUnit()); +// wmsRawOrderIn.setRequestTime(new Date()); +// wmsRawOrderIn.setOrderStatus("0");//暂收 +// wmsRawOrderIn.setActiveFlag("1"); +// wmsRawOrderIn.setSupplyCode(odsProcureOrder.getSupplierCode()); +// //wmsRawOrderIn.setUserDefined1(); +// wmsRawOrderIn.setAccountingStatus("0");//0是暂收 +// wmsRawOrderIn.setUserDefined1(MATERIALDOCUMENT);//物料凭证编号 +// wmsRawOrderIn.setUserDefined2(MATDOCUMENTYEAR);//年凭证号 +// wmsRawOrderIn.setUserDefined3(result2.getMsg());//暂收信息 +// //wmsRawOrderIn.setAccountingMessage(result2.getMsg()); +// wmsRawOrderIn.setSapFactoryCode(factoryCode); +// wmsRawOrderIn.setCreateBy(odsProcureOrder.getCreateBy()); +// wmsRawOrderIn.setGmtCreate(new Date()); +// wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn); +// order1.setSapTempStatus("1");//0是失败。1是成功 +// odsProcureOrderMapper.updateOdsProcureOrder(order1); +// } +// +// +// for (OdsProcureOrder odsProcureOrder1:orderList){ +// //收货 +// WmsOdsMateStorageNewsSn wmsOdsMateStorageNewsSn = new WmsOdsMateStorageNewsSn(); +// wmsOdsMateStorageNewsSn.setMateOrderInSnId(IdUtils.fastSimpleUUID()); +// wmsOdsMateStorageNewsSn.setWhCode(odsProcureOrder1.getWhCode());//仓库编码 +// wmsOdsMateStorageNewsSn.setWaCode(odsProcureOrder1.getWaCode()); +// wmsOdsMateStorageNewsSn.setWlCode(odsProcureOrder1.getSn());//库位编码- +// wmsOdsMateStorageNewsSn.setMaterialCode(odsProcureOrder1.getMaterialCode()); +// wmsOdsMateStorageNewsSn.setMaterialDesc(odsProcureOrder1.getMaterialDesc()); +// wmsOdsMateStorageNewsSn.setSn(odsProcureOrder1.getSn()); +// wmsOdsMateStorageNewsSn.setAmount(odsProcureOrder1.getPlanNumber()); +// wmsOdsMateStorageNewsSn.setCreateBy(odsProcureOrder1.getCreateBy()); +// wmsOdsMateStorageNewsSn.setGmtCreate(new Date()); +// wmsOdsMateStorageNewsSn.setUserDefined2(odsProcureOrder1.getUserDefined7());//批次 +// wmsOdsMateStorageNewsSn.setUserDefined1("RK"); +// wmsOdsMateStorageNewsSn.setUserDefined3("0");//0是暂收，1是真收 +// wmsOdsMateStorageNewsSn.setFactoryCode(odsProcureOrder1.getFactoryCode()); +// wmsOdsMateStorageNewsSn.setSapFactoryCode(odsProcureOrder1.getFactoryCode()); +// wmsOdsMateStorageNewsSn.setActiveFlag("1"); +// wmsOdsMateStorageNewsSnMapper.insertWmsOdsMateStorageNewsSn(wmsOdsMateStorageNewsSn); +// //修改库存 +// //２，修改库存－－－／加库存数量-/-冻结数量 +// WmsOdsEmStorageNews wmsOdsEmStorageNews = new WmsOdsEmStorageNews(); +// wmsOdsEmStorageNews.setWhCode(odsProcureOrder1.getWhCode());//仓库编码 +// wmsOdsEmStorageNews.setWlCode(odsProcureOrder1.getSn());//库位编码 +// wmsOdsEmStorageNews.setWaCode(odsProcureOrder1.getWaCode());//库位编码 +// wmsOdsEmStorageNews.setMaterialCode(odsProcureOrder1.getMaterialCode()); +// wmsOdsEmStorageNews.setUserDefined2(odsProcureOrder1.getUserDefined7());//批次 +// wmsOdsEmStorageNews.setAmount(odsProcureOrder1.getPlanNumber()); +// //添加库存--这个要有个判断有没有这个库存如果没有的话，就插入 +// WmsOdsMateStorageNews wmsOdsMateStorageNews = wmsOdsMateStorageNewsMapper.selectByWhCodeAndMate(wmsOdsEmStorageNews); +// if (wmsOdsMateStorageNews == null) { +// WmsOdsMateStorageNews wmsOdsMateStorageNews1 = new WmsOdsMateStorageNews(); +// wmsOdsMateStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); +// wmsOdsMateStorageNews1.setWhCode(odsProcureOrder1.getWhCode()); +// wmsOdsMateStorageNews1.setWlCode(odsProcureOrder1.getSn()); +// wmsOdsMateStorageNews1.setWaCode(odsProcureOrder1.getWaCode()); +// wmsOdsMateStorageNews1.setAmount(odsProcureOrder1.getPlanNumber()); +// wmsOdsMateStorageNews1.setStorageAmount(odsProcureOrder1.getPlanNumber()); +// wmsOdsMateStorageNews1.setMaterialCode(odsProcureOrder1.getMaterialCode()); +// wmsOdsMateStorageNews1.setMaterialDesc(odsProcureOrder1.getMaterialDesc()); +// wmsOdsMateStorageNews1.setStorageType("BC"); +// wmsOdsMateStorageNews1.setCreateBy(odsProcureOrder1.getCreateBy()); +// wmsOdsMateStorageNews1.setGmtCreate(new Date()); +// wmsOdsMateStorageNews1.setActiveFlag("1"); +// wmsOdsMateStorageNews1.setFactoryCode(odsProcureOrder1.getFactoryCode()); +// wmsOdsMateStorageNews1.setSapFactoryCode(odsProcureOrder1.getFactoryCode()); +// wmsOdsMateStorageNews1.setUserDefined1(odsProcureOrder1.getUnit());//单位 +// wmsOdsMateStorageNewsMapper.insertWmsOdsMateStorageNews(wmsOdsMateStorageNews1); +// } else { +// wmsOdsMateStorageNewsSnMapper.updateAdd(wmsOdsEmStorageNews); +// } +// // wmsRawOrderInSnMapper.updateU1Byid(wmsRawOrderInSn);//入库 +// } +// }else {////失败| +// result1="暂收失败"; +// for (OdsProcureOrder order : +// orderList1) { +// OdsProcureOrder order2 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getID()); +// order2.setSapTempInfor(result2.getMsg()); +// order2.setSapTempStatus("0");//0是失败。1是成功 +// odsProcureOrderMapper.updateOdsProcureOrder(order2); +// } +// return result1; +// } +// return result1; +// } + public String dayin( List orderList) { // 定义请求的URL地址 diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java index 5a36506ee..645862174 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java @@ -210,6 +210,7 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService }else { odsProcureOutOrder1.setUserDefined3(""); } + odsProcureOutOrder1.setUserDefined5(order.getSelectedBatch());//批次 odsProcureOutOrder1.setUserDefined4(order.getProduceCode()); odsProcureOutOrder1.setUserDefined10("1"); odsProcureOutOrder1.setCreateBy(SecurityUtils.getUsername()); @@ -233,4 +234,11 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService List orderList = odsProcureOutOrderMapper.selectOdsProcureReturnOrderListZC(odsProcureOutOrder); return orderList; } + + @Override + @DS("#header.poolName") + public List listReturnDY(OdsProcureOutOrder odsProcureOutOrder) { + List orderList = odsProcureOutOrderMapper.selectOdsProcureReturnOrderListZC(odsProcureOutOrder); + return orderList; + } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml index 8c110c49c..a86bdd874 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOrderMapper.xml @@ -40,6 +40,7 @@ + @@ -125,6 +126,44 @@ where ID = #{ID} + + @@ -493,6 +571,23 @@ WHERE card.User_Defined1= #{userDefined1} + + update wms_ods_procure_out_order Site_code = #{siteCode}, @@ -1009,7 +1009,46 @@ Enterprise_Code = #{enterpriseCode}, where ID = #{ID} - + + + update wms_ods_procure_return_order + + Site_code = #{siteCode}, + Produce_Code = #{produceCode}, + Material_Code = #{materialCode}, + Material_Desc = #{materialDesc}, + Plan_Date = #{planDate}, + Plan_Number = #{planNumber}, + Unit = #{Unit}, + Return_Number = #{returnNumber}, + Loc_Code = #{locCode}, + Loc_Desc = #{locDesc}, + Production_Line_Desc = #{productionLineDesc}, + Production_Line_Code = #{productionLineCode}, + Order_Status = #{orderStatus}, + User_Defined1 = #{userDefined1}, + User_Defined2 = #{userDefined2}, + User_Defined3 = #{userDefined3}, + User_Defined4 = #{userDefined4}, + User_Defined5 = #{userDefined5}, + User_Defined6 = #{userDefined6}, + User_Defined7 = #{userDefined7}, + User_Defined8 = #{userDefined8}, + User_Defined9 = #{userDefined9}, + User_Defined10 = #{userDefined10}, + User_Defined11 = #{userDefined11}, + Supplier_Code = #{supplierCode}, + Supplier_Name = #{supplierName}, + Create_By = #{createBy}, + Create_Date = #{createDate}, + Last_Update_By = #{lastUpdateBy}, + Last_Update_Date = #{lastUpdateDate}, + Active = #{Active}, + Enterprise_Id = #{enterpriseId}, + Enterprise_Code = #{enterpriseCode}, + + where ID = #{ID} +