From 4d5089a804c1557e904a492f84257b11597b1796 Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Wed, 4 Jun 2025 15:00:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7PO?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D=E7=A7=B0?= =?UTF-8?q?;=E9=87=87=E8=B4=AD=E6=94=B6(SRM)=E6=93=8D=E4=BD=9C=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E6=8F=90=E9=86=92=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/OdsProcureOrderServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 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 c74f126f3..95a327797 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 @@ -18,6 +18,7 @@ import com.op.common.core.domain.R; import com.op.common.core.utils.DateUtils; +import com.op.common.core.utils.StringUtils; import com.op.common.core.web.domain.AjaxResult; import com.op.common.security.utils.SecurityUtils; import com.op.system.api.RemoteOpenService; @@ -171,7 +172,12 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { // @DS("#header.poolName") public List PurchaseOrderPda(OdsProcureOrder odsProcureOrder) { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); - return odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); + List orderList= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); + for (OdsProcureOrder order: orderList) { + String name = odsProcureOrderMapper.selectBaseSupplier(order); + order.setSupplierName(name); + } + return orderList; } @Override @@ -1546,6 +1552,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { } }else {////失败| result1="暂收失败"; + if (StringUtils.isNotEmpty(result2.getMsg())) { + result1=result2.getMsg(); + } for (OdsProcureOrder order : orderList1) { OdsProcureOrder order2 = odsProcureOrderMapper.selectOdsProcureOrderByID(order.getID()); From a1cb7d93a7a9a6eeb3f65b58fd52a9879d80314d Mon Sep 17 00:00:00 2001 From: FCD <2453864257@qq.com> Date: Fri, 13 Jun 2025 10:32:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9C=BA105=E8=BF=87?= =?UTF-8?q?=E8=B4=A6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsRawOrderInController.java | 11 +++ .../com/op/wms/domain/OdsProcureOrder.java | 35 ++++++++ .../op/wms/mapper/WmsRawOrderInMapper.java | 3 + .../op/wms/service/IWmsRawOrderInService.java | 5 ++ .../impl/OdsProcureOrderServiceImpl.java | 23 +++-- .../impl/WmsRawOrderInServiceImpl.java | 17 ++++ .../mapper/wms/OdsProcureOrderMapper.xml | 86 ++++++++++++++++++- .../mapper/wms/WmsRawOrderInMapper.xml | 73 ++++++++++++++++ 8 files changed, 244 insertions(+), 9 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java index 256271cf4..dc200425f 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRawOrderInController.java @@ -137,4 +137,15 @@ public class WmsRawOrderInController extends BaseController { List list = wmsRawOrderInService.listInspectionReport(wmsRawOrderIn); return getDataTable(list); } + + /** + * pda上查询包材到货单已暂时列表 + */ + @GetMapping("/wmsRawOrderInListToPda") + public TableDataInfo getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn) { + startPage(); + List list = wmsRawOrderInService.getWmsRawOrderInListToPda(wmsRawOrderIn); + return getDataTable(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 43ac28a2b..6246b2487 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 @@ -315,6 +315,18 @@ public class OdsProcureOrder extends BaseEntity { @Excel(name = "供应商编码") private String supplierCode; + /** + * 关联表 wms_raw_order_in id; + * **/ + private String rawOrderInId; + + /** + * 质量检验状态 Y：合格 + * **/ + private String qualityStatus; + + private String rawPoNo; + private String Remark; public String getRemark() { @@ -666,6 +678,29 @@ public class OdsProcureOrder extends BaseEntity { return enterpriseCode; } + public String getRawOrderInId() { + return rawOrderInId; + } + + public void setRawOrderInId(String rawOrderInId) { + this.rawOrderInId = rawOrderInId; + } + + public String getQualityStatus() { + return qualityStatus; + } + + public void setQualityStatus(String qualityStatus) { + this.qualityStatus = qualityStatus; + } + + public String getRawPoNo() { + return rawPoNo; + } + + public void setRawPoNo(String rawPoNo) { + this.rawPoNo = rawPoNo; + } @Override public String toString() { return "OdsProcureOrder{" + diff --git a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java index 3d61ff11a..a928030b2 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRawOrderInMapper.java @@ -74,4 +74,7 @@ public interface WmsRawOrderInMapper { WmsRawOrderIn selectWmsRawOrderInByRawOrderInIdThress(@Param("rawOrderInId")String id); List listInspectionReport(WmsRawOrderIn wmsRawOrderIn); + + List getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn); + } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java index 226da794d..b0a868b10 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IWmsRawOrderInService.java @@ -60,4 +60,9 @@ public interface IWmsRawOrderInService { public int deleteWmsRawOrderInByRawOrderInId(String rawOrderInId); List listInspectionReport(WmsRawOrderIn wmsRawOrderIn); + + /** + * pda上查询包材到货单已暂时列表 + */ + List getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn); } 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 95a327797..6def53a27 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 @@ -172,12 +172,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { // @DS("#header.poolName") public List PurchaseOrderPda(OdsProcureOrder odsProcureOrder) { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); - List orderList= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); - for (OdsProcureOrder order: orderList) { - String name = odsProcureOrderMapper.selectBaseSupplier(order); - order.setSupplierName(name); + List list= odsProcureOrderMapper.selectOdsProcureOrderList(odsProcureOrder); + for (OdsProcureOrder order: list) { + WmsRawOrderIn wmsRawOrderIn = new WmsRawOrderIn(); + wmsRawOrderIn.setUserDefined6( order.getRawPoNo()+order.getUserDefined7()); + wmsRawOrderIn.setMaterialCode(order.getMaterialCode()); + String checkResult = wmsRawOrderInMapper.selectQcCheckTask(wmsRawOrderIn); + order.setQualityStatus(checkResult); } - return orderList; + return list; } @Override @@ -1796,7 +1799,15 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { public List PurchaseOrderPdaT(OdsProcureOrder odsProcureOrder) { DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); odsProcureOrder.setOperationNumber(new BigDecimal("1")); - return odsProcureOrderMapper.selectOdsProcureOrderListT(odsProcureOrder); + List list = odsProcureOrderMapper.selectOdsProcureOrderListT(odsProcureOrder); + for (OdsProcureOrder order: list) { + WmsRawOrderIn wmsRawOrderIn = new WmsRawOrderIn(); + wmsRawOrderIn.setUserDefined6( order.getRawPoNo()+order.getUserDefined7()); + wmsRawOrderIn.setMaterialCode(order.getMaterialCode()); + String checkResult = wmsRawOrderInMapper.selectQcCheckTask(wmsRawOrderIn); + order.setQualityStatus(checkResult); + } + return list; } @Override diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java index bd5c8e310..958c9d635 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsRawOrderInServiceImpl.java @@ -105,4 +105,21 @@ public class WmsRawOrderInServiceImpl implements IWmsRawOrderInService { List wmsRawOrderInList= wmsRawOrderInMapper.listInspectionReport(wmsRawOrderIn); return wmsRawOrderInList; } + + /** + * pda上查询包材到货单已暂时列表 + * + * @param wmsRawOrderIn + */ + @Override + @DS("#header.poolName") + public List getWmsRawOrderInListToPda(WmsRawOrderIn wmsRawOrderIn) { + List wmsRawOrderInList= wmsRawOrderInMapper.getWmsRawOrderInListToPda(wmsRawOrderIn); + for (WmsRawOrderIn wmsRawOrderIn1: wmsRawOrderInList) { + wmsRawOrderIn1.setUserDefined6( wmsRawOrderIn1.getPoNo()+wmsRawOrderIn1.getUserDefined7()); + String checkResult = wmsRawOrderInMapper.selectQcCheckTask(wmsRawOrderIn1); + wmsRawOrderIn1.setQualityStatus(checkResult); + } + return wmsRawOrderInList; + } } 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 d7e47fd12..387738158 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 @@ -46,7 +46,8 @@ - + + @@ -90,7 +91,47 @@ + + +