From db912976940871dd4850dd316a397f145cb210f1 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Thu, 8 Aug 2024 17:18:45 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=A0=87=E8=AF=86=E5=8D=A1=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=EF=BC=8C=E9=87=87=E8=B4=AD=E5=8D=95bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 2 +- .../com/op/wms/domain/OdsProcureOrder.java | 2 +- .../com/op/wms/domain/WmsLogotypeTable.java | 63 +++++++++++++++++++ .../op/wms/mapper/WmsRawOrderInSnMapper.java | 7 +-- .../impl/OdsProcureOrderServiceImpl.java | 35 +++++++---- .../impl/WmsProductPutServiceImpl.java | 1 + .../impl/WmsProductPutTrayServiceImpl.java | 49 ++++++++------- .../mapper/wms/WmsRawOrderInSnMapper.xml | 15 +++++ 8 files changed, 132 insertions(+), 42 deletions(-) create mode 100644 op-modules/op-wms/src/main/java/com/op/wms/domain/WmsLogotypeTable.java 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 1751ad7d..83a049aa 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 @@ -113,7 +113,7 @@ public class WmsToWCSmissionController { } /** - * 手持 －－包材采购单采购收货确认操作 + * 手持 －－包材采购单采购收货确认操作--我们把入库砍掉了，你这个就是入库操作了 */ @PostMapping("/PurchaseOrderdeliPdaConfirm") 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 b11e9db4..0eb96bde 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 @@ -233,7 +233,7 @@ public class OdsProcureOrder extends BaseEntity { private String userDefined7; /** - * 用户自定义属性8 + * 用户自定义属性8--判断是用采购单还是送货单获取的 */ @Excel(name = "用户自定义属性8") private String userDefined8; diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsLogotypeTable.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsLogotypeTable.java new file mode 100644 index 00000000..a4d1f7b6 --- /dev/null +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsLogotypeTable.java @@ -0,0 +1,63 @@ +package com.op.wms.domain; + +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +public class WmsLogotypeTable extends BaseEntity { + private static final long serialVersionUID = 1L; + /** + * 唯一序列 + */ + @Excel(name = "唯一序列") + private String id; + + /** + * 仓库编码 + */ + @Excel(name = "仓库编码") + private String logotype; + + /** + * 区域编号 + */ + @Excel(name = "区域编号") + private String sn; + + /** + * 库区编码 + */ + @Excel(name = "库区编码") + private String activeFlag; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getLogotype() { + return logotype; + } + + public void setLogotype(String logotype) { + this.logotype = logotype; + } + + public String getSn() { + return sn; + } + + public void setSn(String sn) { + this.sn = sn; + } + + public String getActiveFlag() { + return activeFlag; + } + + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } +} diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java index 5d34d5a7..51766dd5 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInSnMapper.java @@ -2,10 +2,7 @@ package com.op.wms.mapper; import java.util.List; -import com.op.wms.domain.OdsProcureOrder; -import com.op.wms.domain.WCSInventoryPlan; -import com.op.wms.domain.WmsRawOrderInSn; -import com.op.wms.domain.WmsToWCSDTO; +import com.op.wms.domain.*; /** * 原材料收货明细Mapper接口 @@ -68,4 +65,6 @@ public interface WmsRawOrderInSnMapper { List selecPurchaseOrderdeliPdaList(OdsProcureOrder odsProcureOrder); + + void insertWmsLogotypeTable(WmsLogotypeTable wmsLogotypeTable); } 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 dcfc7c2c..6f135831 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 @@ -181,7 +181,19 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { wmsRawOrderInSn.setFactoryCode(odsProcureOrder.getSiteCode()); wmsRawOrderInSn.setUserDefined3(order.getID()); wmsRawOrderInSn.setUserDefined5(odsProcureOrder.getReceiptNoCode()); + wmsRawOrderInSn.setUserDefined6(odsProcureOrder.getUserDefined6());//标识码绑定 + wmsRawOrderInSnMapper.insertWmsRawOrderInSn(wmsRawOrderInSn); + //标识码绑定 + if (odsProcureOrder.getUserDefined6()!=null){ + WmsLogotypeTable wmsLogotypeTable=new WmsLogotypeTable(); + wmsLogotypeTable.setId(IdUtils.fastSimpleUUID()); + wmsLogotypeTable.setLogotype(odsProcureOrder.getUserDefined6()); + wmsLogotypeTable.setSn(odsProcureOrder.getSn()); + wmsLogotypeTable.setActiveFlag("1"); + wmsRawOrderInSnMapper.insertWmsLogotypeTable(wmsLogotypeTable); + } + //插入收货记录 //如果收货完成了的话，就插入信息收货完成 odsProcureOrder.setOrderStatus("1"); @@ -668,6 +680,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); order.setMaterialDesc(sapPurchaseOrderQuery1.get("maktx")); + order.setUserDefined8("1"); order.setActive("1"); List orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order); if (orderList.size() > 0) { @@ -728,6 +741,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { String result="操作成功"; List wmsRawOrderInSn = wmsRawOrderInSnMapper.selecPurchaseOrderdeliPdaList(odsProcureOrder); + return result; } @@ -786,6 +800,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); SapPurchaseOrderQuery sapPurchaseOrderQuery = new SapPurchaseOrderQuery(); sapPurchaseOrderQuery.setEbeln(odsProcureOrder.getProcureCode());//采购单号 + //"ebelp": "10", + //代表是-00010 Map paramMap=new HashMap<>(); paramMap.put("id",odsProcureOrder.getUserDefined5()); AjaxResult result = remoteOpenService.getDeliveryNoteDetail(paramMap); @@ -804,30 +820,26 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } order.setProcureCode(sapPurchaseOrderQuery1.get("orderNum")); order.setSiteCode(sapPurchaseOrderQuery1.get("werks")); - //order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 + order.setUserDefined3(sapPurchaseOrderQuery1.get("ebelp"));//批次 + if (order.getUserDefined3()!=null){ + order.setUserDefined3("000"+order.getUserDefined3()); + } String materialCode = sapPurchaseOrderQuery1.get("matnr"); materialCode = "0000000" + materialCode; order.setMaterialCode(materialCode); -// order.setMaterialCode(sapPurchaseOrderQuery1.get("matnr")); -// order.setMaterialCode("0000000"+order.getMaterialCode()); + order.setUserDefined5(mainId);//送货单 order.setMaterialDesc(sapPurchaseOrderQuery1.get("matnrName")); order.setActive("1"); + order.setUserDefined8("0");//0是属于送货单下的 List orderList = odsProcureOrderMapper.selectOdsProcureOrderList(order); if (orderList.size() > 0) { //这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上 - if (odsProcureOrder.getUserDefined5()!=null){ - order.setUserDefined5(mainId); - odsProcureOrderMapper.updateOdsProcureOrderByProcureCode(order); - } continue; } - order.setUserDefined5(mainId);//送货单 + order.setUserDefined11(sapPurchaseOrderQuery1.get("realDate")); 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"); @@ -835,7 +847,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setCreateDate(new Date()); odsProcureOrderMapper.insertOdsProcureOrder(order); } - } return AjaxResult.success(); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index 7db9a07a..8c8a70e6 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -1004,6 +1004,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductProductionRecords.setSiteCode(proOrderWorkorder.getFactoryCode()); wmsProductProductionRecords.setId(IdUtils.fastSimpleUUID()); wmsProductProductionRecords.setSn(proOrderWorkorder.getSn()); + wmsProductProductionRecords.setUserDefined1(proOrderWorkorder.getAttr1());//标识卡 wmsProductProductionRecords.setQuantity(proOrderWorkorder.getQuantity()); wmsProductProductionRecords.setBatchCode(proOrderWorkorder.getBatchCode()); wmsProductProductionRecords.setProductOrder(proOrderWorkorder.getWorkorderCodeSap()); diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java index 43662f77..6a8185c7 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutTrayServiceImpl.java @@ -1,6 +1,7 @@ package com.op.wms.service.impl; import java.math.BigDecimal; +import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -10,8 +11,10 @@ import com.alibaba.nacos.common.utils.UuidUtils; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; import com.op.common.core.context.SecurityContextHolder; +import com.op.common.core.domain.R; import com.op.common.core.exception.ServiceException; import com.op.common.core.utils.uuid.IdUtils; +import com.op.system.api.domain.quality.QcCheckTaskWarehousingDTO; import com.op.wms.domain.*; import com.op.wms.mapper.*; import org.springframework.beans.factory.annotation.Autowired; @@ -190,30 +193,6 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); } } -// WmsFpStorageNews wmsFpStorageNews = wmsFpStorageNewsMapper.selectWmsFpStorageNewsByProductCode(wmsProductPut.getProductCode()); -// WmsFpStorageNews wmsFpStorageNews1 = new WmsFpStorageNews(); -// // TODO 库存中没有此产品,添加 -// if (ObjectUtils.isEmpty(wmsFpStorageNews)){ -// wmsFpStorageNews1.setStorageId(IdUtils.fastSimpleUUID()); -// wmsFpStorageNews1.setWhCode(wmsProductPut.getWhCode()); -// wmsFpStorageNews1.setWaCode(wmsProductPut.getWaCode()); -// wmsFpStorageNews1.setStorageType("成品"); -// wmsFpStorageNews1.setWlCode(wmsProductPut.getWlCode()); -// wmsFpStorageNews1.setProductCode(wmsProductPut.getProductCode()); -// wmsFpStorageNews1.setProductName(wmsProductPut.getProductName()); -// BigDecimal putQuantity = new BigDecimal(wmsProductPut.getPutQuantity()); -// wmsFpStorageNews1.setAmount(putQuantity); -// wmsFpStorageNews1.setCreateBy(SecurityContextHolder.getUserName()); -// wmsFpStorageNews1.setCreateTime(new Date()); -// wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews1); -// }else { -// //加库存数量 -// BigDecimal putQuantity = new BigDecimal(wmsProductPut.getPutQuantity()); -// wmsFpStorageNews.setAmount(wmsFpStorageNews.getAmount().add(putQuantity)); -// wmsFpStorageNews.setUpdateBy(SecurityContextHolder.getUserName()); -// wmsFpStorageNews.setUpdateTime(new Date()); -// wmsFpStorageNewsMapper.updateWmsFpStorageNews(wmsFpStorageNews); -// } //todo 生成库存明细 for (WmsProductPutTray wmsProductPutTray : wmsProductPutTrays) { WmsFpStorageNewsSn wmsFpStorageNewsSn1 = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnBySnAndProductCodeAndWlCode(wmsProductPut.getProductCode(), wmsProductPutTray.getSn(), wmsProductPutTray.getWlCode()); @@ -276,6 +255,28 @@ public class WmsProductPutTrayServiceImpl implements IWmsProductPutTrayService { // wmsProductPutTrayCode.setNumber(wmsProductPutTrayCode.getNumber()+Integer.parseInt(wmsProductPutTray.getNumber())); // wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); } + +// for (wmsProductPut wmsReportWork: +// wmsProductPutTrays) { +// QcCheckTaskWarehousingDTO qcCheckTaskWarehousingDTO = new QcCheckTaskWarehousingDTO(); +// qcCheckTaskWarehousingDTO.setFactoryCode(factoryCode); +// qcCheckTaskWarehousingDTO.setIncomeBatchNo(wmsReportWork.getBatch()); +// qcCheckTaskWarehousingDTO.setOrderNo(wmsReportWork.getWorkorderCodeSap()); +// qcCheckTaskWarehousingDTO.setMaterialCode(wmsReportWork.getProductCode()); +// qcCheckTaskWarehousingDTO.setMaterialName(wmsReportWork.getProductName()); +// qcCheckTaskWarehousingDTO.setCheckType("checkTypeCP"); +// qcCheckTaskWarehousingDTO.setQuality(wmsReportWork.getQuantityQualified()); +// +// qcCheckTaskWarehousingDTO.setSupplierName("小榄成品现货仓"); +// qcCheckTaskWarehousingDTO.setSupplierCode(wmsReportWork.getWhCode()); +// qcCheckTaskWarehousingDTO.setCheckLoc("mjtest"); +// SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); +// Date productDate = simpleDateFormat.parse(wmsReportWork.getProductDate()); +// qcCheckTaskWarehousingDTO.setIncomeTime(productDate); +// //qcCheckTaskWarehousingDTO. +// R productTask= remoteQualityService.createProductTask(qcCheckTaskWarehousingDTO); +// productTask.getData(); +// } return 1; } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml index 409b1a72..4c63f514 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsRawOrderInSnMapper.xml @@ -225,4 +225,19 @@ user_defined4; + + insert into wms_logotype_table( + id, + logotype, + sn, + activeFlag + ) + values + ( + #{id}, + #{logotype}, + #{sn}, + #{activeFlag} + ) +