From 21ac32c35cc76d4fa0019343956df75d0945b36e Mon Sep 17 00:00:00 2001 From: mengjiao <3338049200@qq,com> Date: Tue, 4 Jun 2024 11:12:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=B0=E8=B4=A7=E7=99=BB=E8=AE=B0=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2--=E7=99=BB=E8=AE=B0=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WmsToWCSmissionController.java | 9 ++++++++ .../com/op/wms/domain/OdsProcureOrder.java | 22 +++++++++++++++++++ .../op/wms/mapper/OdsProcureOrderMapper.java | 2 ++ .../wms/service/IOdsProcureOrderService.java | 2 ++ .../impl/OdsProcureOrderServiceImpl.java | 7 ++++++ .../mapper/wms/OdsProcureOrderMapper.xml | 10 +++++++++ 6 files changed, 52 insertions(+) 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 77e1738d..2c2fdc0f 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 @@ -133,7 +133,16 @@ public class WmsToWCSmissionController { String result = odsProcureOrderService.ArrivalRegistration(odsProcureOrder); return success(result); } + /** + * 手持 －查询到货登记记录--已登记数量 + */ + + @PostMapping("/ArrivalRegistrationreader") + public AjaxResult ArrivalRegistrationreader(@RequestBody OdsProcureOrder odsProcureOrder) { + List result = odsProcureOrderService.ArrivalRegistrationreader(odsProcureOrder); + return success(result); + } /** 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 5b5ae668..b11e9db4 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 @@ -297,6 +297,28 @@ public class OdsProcureOrder extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date lastUpdateDate; + //时间范围MIN--MAX + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastUpdateDateMIN; + + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastUpdateDateMAX; + + public Date getLastUpdateDateMIN() { + return lastUpdateDateMIN; + } + + public void setLastUpdateDateMIN(Date lastUpdateDateMIN) { + this.lastUpdateDateMIN = lastUpdateDateMIN; + } + + public Date getLastUpdateDateMAX() { + return lastUpdateDateMAX; + } + + public void setLastUpdateDateMAX(Date lastUpdateDateMAX) { + this.lastUpdateDateMAX = lastUpdateDateMAX; + } /** * 可用标识 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 dad24ecb..fdd5a971 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 @@ -66,4 +66,6 @@ public interface OdsProcureOrderMapper { List selectOdsProcureOrderAlreadyList(OdsProcureOrder odsProcureOrder); void updateOdsProcureOrderAddOperationNumber(OdsProcureOrder odsProcureOrder); + + List selectOdsProcureOrderAlreadyReaderList(OdsProcureOrder odsProcureOrder); } diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java index fb780109..2a395337 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOrderService.java @@ -101,4 +101,6 @@ public interface IOdsProcureOrderService { String ArrivalRegistration(OdsProcureOrder odsProcureOrder); OdsProcureOrder selectArrivalRegistration(OdsProcureOrder odsProcureOrder); + + List ArrivalRegistrationreader(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 52db3a3f..06f70ea7 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 @@ -771,6 +771,13 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return order; } + @Override + public List ArrivalRegistrationreader(OdsProcureOrder odsProcureOrder) { + DynamicDataSourceContextHolder.push("ds_" + odsProcureOrder.getFactoryCode()); + List orderList= odsProcureOrderMapper.selectOdsProcureOrderAlreadyReaderList(odsProcureOrder); + return orderList; + } + public String DesignatedPalletOutboundWCS(WMSDesignatedPalle wmsDesignatedPalle) { // 定义请求的URL地址 String url = "http://192.168.202.37:9001/api/v1/ReceiveMesMsg/packingMaterialsOutBoundByPallet"; 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 9931f297..b2587880 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 @@ -224,4 +224,14 @@ Last_Update_Date = getdate() where ID = #{ID} +