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 d09e5c9eb..6fa1f95c0 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 @@ -31,6 +31,17 @@ public class OdsProcureOrder extends BaseEntity { * 已登记数量 */ +// 托盘数量 + private BigDecimal palletNum; + + public BigDecimal getPalletNum() { + return palletNum; + } + + public void setPalletNum(BigDecimal palletNum) { + this.palletNum = palletNum; + } + private BigDecimal operationNumber; private BigDecimal czNumber; @@ -238,9 +249,9 @@ public class OdsProcureOrder extends BaseEntity { private String userDefined4; /** - * 用户自定义属性5 + * 送货单号 */ - @Excel(name = "用户自定义属性5") + @Excel(name = "送货单号") private String userDefined5; /** @@ -639,38 +650,56 @@ public class OdsProcureOrder extends BaseEntity { @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("siteCode", getSiteCode()) - .append("ID", getID()) - .append("procureCode", getProcureCode()) - .append("materialCode", getMaterialCode()) - .append("materialDesc", getMaterialDesc()) - .append("planDate", getPlanDate()) - .append("planNumber", getPlanNumber()) - .append("Unit", getUnit()) - .append("realityNumber", getRealityNumber()) - .append("orderStatus", getOrderStatus()) - .append("userDefined1", getUserDefined1()) - .append("userDefined2", getUserDefined2()) - .append("userDefined3", getUserDefined3()) - .append("userDefined4", getUserDefined4()) - .append("userDefined5", getUserDefined5()) - .append("userDefined6", getUserDefined6()) - .append("userDefined7", getUserDefined7()) - .append("userDefined8", getUserDefined8()) - .append("userDefined9", getUserDefined9()) - .append("userDefined10", getUserDefined10()) - .append("userDefined11", getUserDefined11()) - .append("supplierCode", getSupplierCode()) - .append("supplierName", getSupplierName()) - .append("Remark", getRemark()) - .append("createBy", getCreateBy()) - .append("createDate", getCreateDate()) - .append("lastUpdateBy", getLastUpdateBy()) - .append("lastUpdateDate", getLastUpdateDate()) - .append("Active", getActive()) - .append("enterpriseId", getEnterpriseId()) - .append("enterpriseCode", getEnterpriseCode()) - .toString(); + return "OdsProcureOrder{" + + "ID='" + ID + '\'' + + ", factoryCode='" + factoryCode + '\'' + + ", list=" + list + + ", palletNum=" + palletNum + + ", operationNumber=" + operationNumber + + ", czNumber=" + czNumber + + ", siteCode='" + siteCode + '\'' + + ", cardNum='" + cardNum + '\'' + + ", whCode='" + whCode + '\'' + + ", waCode='" + waCode + '\'' + + ", sn='" + sn + '\'' + + ", poLine='" + poLine + '\'' + + ", procureCode='" + procureCode + '\'' + + ", receiptNoCode='" + receiptNoCode + '\'' + + ", materialCode='" + materialCode + '\'' + + ", incomeBatchNo='" + incomeBatchNo + '\'' + + ", materialDesc='" + materialDesc + '\'' + + ", planDate=" + planDate + + ", planNumber=" + planNumber + + ", buNumber=" + buNumber + + ", Unit='" + Unit + '\'' + + ", realityNumber=" + realityNumber + + ", orderStatus='" + orderStatus + '\'' + + ", userDefined1='" + userDefined1 + '\'' + + ", userDefined2='" + userDefined2 + '\'' + + ", userDefined3='" + userDefined3 + '\'' + + ", userDefined4='" + userDefined4 + '\'' + + ", userDefined5='" + userDefined5 + '\'' + + ", userDefined6='" + userDefined6 + '\'' + + ", userDefined7='" + userDefined7 + '\'' + + ", userDefined8='" + userDefined8 + '\'' + + ", userDefined9='" + userDefined9 + '\'' + + ", userDefined10='" + userDefined10 + '\'' + + ", userDefined11='" + userDefined11 + '\'' + + ", supplierCode='" + supplierCode + '\'' + + ", Remark='" + Remark + '\'' + + ", supplierName='" + supplierName + '\'' + + ", createDate=" + createDate + + ", lastUpdateBy='" + lastUpdateBy + '\'' + + ", lastUpdateDate=" + lastUpdateDate + + ", lastUpdateDateMIN=" + lastUpdateDateMIN + + ", lastUpdateDateMAX=" + lastUpdateDateMAX + + ", Active='" + Active + '\'' + + ", enterpriseId='" + enterpriseId + '\'' + + ", enterpriseCode='" + enterpriseCode + '\'' + + ", SapTempInfor='" + SapTempInfor + '\'' + + ", SapTempStatus='" + SapTempStatus + '\'' + + ", SAPstatus='" + SAPstatus + '\'' + + ", SAPmessage='" + SAPmessage + '\'' + + '}'; } } 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 c624a7899..ad91da142 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 @@ -111,7 +111,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { List orderList= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); for (OdsProcureOrder order: orderList) { - String name = odsProcureOrderMapper.selectBaseSupplier(order); + String name = odsProcureOrderMapper.selectBaseSupplier(order); order.setSupplierName(name); } 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 eb9218fe8..6aa24a2c9 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 @@ -39,11 +39,46 @@ + - select Site_code, ID, Procure_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit,COALESCE(Reality_Number, 0) Reality_Number, Order_Status, User_Defined1, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Supplier_Code, Supplier_Name, Remark, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code, COALESCE(Operation_Number, 0) Operation_Number from ods_procure_order - + SELECT + o.Site_code, + o.ID, + o.Procure_Code, + o.Material_Code, + o.Material_Desc, + o.Plan_Date, + o.Plan_Number, + o.Unit, + COALESCE ( Reality_Number, 0 ) Reality_Number, + o.Order_Status, + o.User_Defined1, + o.User_Defined2, + o.User_Defined3, + o.User_Defined4, + o.User_Defined5, + o.User_Defined6, + o.User_Defined7, + o.User_Defined8, + o.User_Defined9, + o.User_Defined10, + o.User_Defined11, + o.Supplier_Code, + o.Supplier_Name, + o.Remark, + o.Create_By, + o.Create_Date, + o.Last_Update_By, + o.Last_Update_Date, + o.Active, + o.Enterprise_Id, + o.Enterprise_Code, + base_product_attached.pallet_num, COALESCE ( Operation_Number, 0 ) Operation_Number + FROM + ods_procure_order as o LEFT JOIN base_product_attached + on o.Material_Code = base_product_attached.product_code