From 393e90e69ef443e444a49f44cad748b11e8a76e4 Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Sat, 7 Sep 2024 11:53:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=8F=B7=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/service/impl/OdsProcureOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..b7ada1854 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 @@ -971,7 +971,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { //这个地方判断下是不是采购单已经被插入了，如果是的话，并且是走的送货单的路径，那就把送货单给她附上 continue; } - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS"); Date date = new Date(); String formattedDate = dateFormat.format(date); order.setUserDefined7(formattedDate+order.getUserDefined3()); From 5514b5d951e81f75083c34498f1825f600b5c9c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Sat, 7 Sep 2024 15:27:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8C=85=E6=9D=90=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/wms/domain/OdsProcureOrder.java | 99 ++++++++++++------- .../impl/OdsProcureOrderServiceImpl.java | 2 +- .../mapper/wms/OdsProcureOrderMapper.xml | 40 +++++++- 3 files changed, 103 insertions(+), 38 deletions(-) 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 From 9340ef8a3d58180ddbb79fd608908e700d9e33c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Sat, 7 Sep 2024 16:45:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8C=85=E6=9D=90=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../op/wms/mapper/OdsProcureOrderMapper.java | 8 + .../impl/OdsProcureOrderServiceImpl.java | 6 +- .../mapper/wms/OdsProcureOrderMapper.xml | 139 ++++++++++++++---- 3 files changed, 120 insertions(+), 33 deletions(-) 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 cb18b0b5c..d2185f503 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 @@ -81,4 +81,12 @@ public interface OdsProcureOrderMapper { void updateodsProcureOrderCard(OdsProcureOrder order1); OdsProcureOrder selectOdsProcureOrderByIDAndSap(String id); + + /** + * 查询包材采购单列表 + * + * @param odsProcureOrder 包材采购单 + * @return 包材采购单集合 + */ + public List selectOdsProcureOrderList1(OdsProcureOrder odsProcureOrder); } 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 c766e1df0..dbcd368b9 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 @@ -108,7 +108,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { @Override @DS("#header.poolName") public List selectOdsProcureOrderList(OdsProcureOrder odsProcureOrder) { - List orderList= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); + List orderList= odsProcureOrderMapper.selectOdsProcureOrderList1(odsProcureOrder); for (OdsProcureOrder order: orderList) { String name = odsProcureOrderMapper.selectBaseSupplier(order); @@ -1454,6 +1454,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } } + + public String dayin( List orderList) { // 定义请求的URL地址 String url = dayinUrl1; @@ -1820,4 +1822,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return null; } + + } 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 6aa24a2c9..479884f2c 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 @@ -44,41 +44,40 @@ SELECT - o.Site_code, - o.ID, - o.Procure_Code, - o.Material_Code, - o.Material_Desc, - o.Plan_Date, - o.Plan_Number, - o.Unit, + Site_code, + ID, + Procure_Code, + Material_Code, + Material_Desc, + Plan_Date, + Plan_Number, + 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, + 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, 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 + ods_procure_orde + update ods_procure_order_card SET User_Defined10 = '1'