From dfc22587688a19bf45096b20db29729b2240b5de Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Fri, 29 Mar 2024 14:26:24 +0800 Subject: [PATCH] =?UTF-8?q?wms=E6=88=90=E5=93=81=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B927?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/domain/WmsAllocationOutEmbryo.java | 501 ++++++++++++++++++ .../op/wms/mapper/WmsSellOutEmbryoMapper.java | 3 + .../impl/WmsProductPutServiceImpl.java | 8 +- .../mapper/wms/WmsSellOutEmbryoMapper.xml | 116 ++++ 4 files changed, 624 insertions(+), 4 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsAllocationOutEmbryo.java b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsAllocationOutEmbryo.java index 702ce761..1e28ea41 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsAllocationOutEmbryo.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/domain/WmsAllocationOutEmbryo.java @@ -1,6 +1,14 @@ package com.op.wms.domain; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; /** * 成品调拨单 @@ -12,4 +20,497 @@ public class WmsAllocationOutEmbryo extends BaseEntity { * ID */ private String id; + + /** + * 交货单号 + */ + @Excel(name = "交货单号") + private String deliveryOrder; + + /** + * 项次 + */ + @Excel(name = "项次") + private String itemNumber; + + /** + * 工厂编码 + */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** + * 仓库编码 + */ + @Excel(name = "仓库编码") + private String whCode; + + /** + * 库区编码 + */ + @Excel(name = "库区编码") + private String waCode; + + /** + * 库位编码 + */ + @Excel(name = "库位编码") + private String wlCode; + + /** + * 出库地点 + */ + @Excel(name = "出库地点") + private String deliveryPlace; + + /** + * 产品名称 + */ + @Excel(name = "产品名称") + private String productName; + + /** + * 产品编码 + */ + @Excel(name = "产品编码") + private String productCode; + + /** + * 产品分类 + */ + @Excel(name = "产品分类") + private String productSort; + + /** + * 规格型号 + */ + @Excel(name = "规格型号") + private String specification; + + /** + * 单位 + */ + @Excel(name = "单位") + private String unitOfMeasure; + + /** + * 批号 + */ + @Excel(name = "批次号") + private String lotNumber; + + /** + * 计划出库数量 + */ + @Excel(name = "计划出库数量") + private BigDecimal planQuantity; + + /** + * 出库数量 + */ + @Excel(name = "出库数量") + private BigDecimal outQuantity; + + /** + * 出库状态--0进行，1完成 + */ + @Excel(name = "出库状态") + private String status; + + /** + * 过账SAP状态 + */ + @Excel(name = "过账SAP状态") + private String sapStatus; + + /** + * 过账SAP凭证 + */ + @Excel(name = "过账SAP凭证") + private String sapProof; + + /** + * 过账SAP返回信息 + */ + @Excel(name = "过账SAP返回信息") + private String sapMessage; + + /** + * 出库时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date outDate; + + /** + * 预留字段1 + */ + @Excel(name = "预留字段1") + private String attr1; + + /** + * 预留字段2 + */ + @Excel(name = "预留字段2") + private String attr2; + + /** + * 预留字段3 + */ + @Excel(name = "预留字段3") + private String attr3; + + /** + * 预留字段4 + */ + @Excel(name = "预留字段4") + private String attr4; + + /** + * 预留字段5 + */ + @Excel(name = "预留字段5") + private String attr5; + + /** + * 预留字段6 + */ + @Excel(name = "预留字段6") + private String attr6; + + /** + * 预留字段7 + */ + @Excel(name = "预留字段7") + private String attr7; + + /** + * 预留字段8 + */ + @Excel(name = "预留字段8") + private String attr8; + + /** + * 预留字段9 + */ + @Excel(name = "预留字段9") + private String attr9; + + /** + * 预留字段10 + */ + @Excel(name = "预留字段10") + private String attr10; + /** + * 有效标记 + */ + @Excel(name = "有效标记") + private String activeFlag; + private List wmsProductPutTrayCodeList; + + public List getWmsProductPutTrayCodeList() { + return wmsProductPutTrayCodeList; + } + + public void setWmsProductPutTrayCodeList(List wmsProductPutTrayCodeList) { + this.wmsProductPutTrayCodeList = wmsProductPutTrayCodeList; + } + + public String getActiveFlag() { + return activeFlag; + } + + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public void setId(String id) { + this.id = id; + } + + public String getId() { + return id; + } + + public void setDeliveryOrder(String deliveryOrder) { + this.deliveryOrder = deliveryOrder; + } + + public String getDeliveryOrder() { + return deliveryOrder; + } + + public void setItemNumber(String itemNumber) { + this.itemNumber = itemNumber; + } + + public String getItemNumber() { + return itemNumber; + } + + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWhCode() { + return whCode; + } + + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWaCode() { + return waCode; + } + + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getWlCode() { + return wlCode; + } + + public void setDeliveryPlace(String deliveryPlace) { + this.deliveryPlace = deliveryPlace; + } + + public String getDeliveryPlace() { + return deliveryPlace; + } + + public void setProductName(String productName) { + this.productName = productName; + } + + public String getProductName() { + return productName; + } + + public void setProductCode(String productCode) { + this.productCode = productCode; + } + + public String getProductCode() { + return productCode; + } + + public void setProductSort(String productSort) { + this.productSort = productSort; + } + + public String getProductSort() { + return productSort; + } + + public void setSpecification(String specification) { + this.specification = specification; + } + + public String getSpecification() { + return specification; + } + + public void setUnitOfMeasure(String unitOfMeasure) { + this.unitOfMeasure = unitOfMeasure; + } + + public String getUnitOfMeasure() { + return unitOfMeasure; + } + + public void setLotNumber(String lotNumber) { + this.lotNumber = lotNumber; + } + + public String getLotNumber() { + return lotNumber; + } + + public void setPlanQuantity(BigDecimal planQuantity) { + this.planQuantity = planQuantity; + } + + public BigDecimal getPlanQuantity() { + return planQuantity; + } + + public void setOutQuantity(BigDecimal outQuantity) { + this.outQuantity = outQuantity; + } + + public BigDecimal getOutQuantity() { + return outQuantity; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + + public void setSapStatus(String sapStatus) { + this.sapStatus = sapStatus; + } + + public String getSapStatus() { + return sapStatus; + } + + public void setSapProof(String sapProof) { + this.sapProof = sapProof; + } + + public String getSapProof() { + return sapProof; + } + + public void setSapMessage(String sapMessage) { + this.sapMessage = sapMessage; + } + + public String getSapMessage() { + return sapMessage; + } + + public void setOutDate(Date outDate) { + this.outDate = outDate; + } + + public Date getOutDate() { + return outDate; + } + + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + + public void setAttr5(String attr5) { + this.attr5 = attr5; + } + + public String getAttr5() { + return attr5; + } + + public void setAttr6(String attr6) { + this.attr6 = attr6; + } + + public String getAttr6() { + return attr6; + } + + public void setAttr7(String attr7) { + this.attr7 = attr7; + } + + public String getAttr7() { + return attr7; + } + + public void setAttr8(String attr8) { + this.attr8 = attr8; + } + + public String getAttr8() { + return attr8; + } + + public void setAttr9(String attr9) { + this.attr9 = attr9; + } + + public String getAttr9() { + return attr9; + } + + public void setAttr10(String attr10) { + this.attr10 = attr10; + } + + public String getAttr10() { + return attr10; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("deliveryOrder", getDeliveryOrder()) + .append("itemNumber", getItemNumber()) + .append("factoryCode", getFactoryCode()) + .append("whCode", getWhCode()) + .append("waCode", getWaCode()) + .append("wlCode", getWlCode()) + .append("deliveryPlace", getDeliveryPlace()) + .append("productName", getProductName()) + .append("productCode", getProductCode()) + .append("productSort", getProductSort()) + .append("specification", getSpecification()) + .append("unitOfMeasure", getUnitOfMeasure()) + .append("lotNumber", getLotNumber()) + .append("planQuantity", getPlanQuantity()) + .append("outQuantity", getOutQuantity()) + .append("status", getStatus()) + .append("sapStatus", getSapStatus()) + .append("sapProof", getSapProof()) + .append("sapMessage", getSapMessage()) + .append("outDate", getOutDate()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("attr5", getAttr5()) + .append("attr6", getAttr6()) + .append("attr7", getAttr7()) + .append("attr8", getAttr8()) + .append("attr9", getAttr9()) + .append("attr10", getAttr10()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java index 0fdceb59..c5d6c78b 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsSellOutEmbryoMapper.java @@ -2,6 +2,7 @@ package com.op.wms.mapper; import java.util.List; +import com.op.wms.domain.WmsAllocationOutEmbryo; import com.op.wms.domain.WmsSellOutEmbryo; import org.apache.ibatis.annotations.Param; @@ -76,4 +77,6 @@ public interface WmsSellOutEmbryoMapper { * @return */ public WmsSellOutEmbryo selectWmsSellOutEmbryoByOrderCodeAndProductCode(@Param("deliveryOrder") String deliveryOrder, @Param("productCode") String productCode); + + List selectWmsAllocationOutEmbryoList(WmsAllocationOutEmbryo wmsAllocationOutEmbryo); } 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 4bcef6a8..102b4112 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 @@ -885,9 +885,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } @Override - public List selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo) { - - - return null; + public List selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsAllocationOutEmbryo) { + DynamicDataSourceContextHolder.push("ds_" + wmsAllocationOutEmbryo.getFactoryCode()); + List wmsAllocationOutEmbryoList= wmsSellOutEmbryoMapper.selectWmsAllocationOutEmbryoList(wmsAllocationOutEmbryo); + return wmsAllocationOutEmbryoList; } } diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml index e793c271..bbf16715 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/WmsSellOutEmbryoMapper.xml @@ -44,6 +44,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, delivery_order, Item_number,active_flag, factory_code, wh_code, wa_code, wl_code, delivery_place, product_name, product_code, product_sort, specification, unit_of_measure, lot_number, plan_quantity, out_quantity, status, SAP_status, SAP_proof, SAP_message, out_date, attr1, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time, remark from wms_sell_out_embryo @@ -242,4 +281,81 @@ #{id} +