From 96020c45108a1baaf88aef69818ec9c204e5d83b Mon Sep 17 00:00:00 2001 From: bns_han <1604366271@qq.com> Date: Wed, 24 Jan 2024 18:33:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackReceiveController.java | 11 +++++++++++ .../bonus/sgzb/app/domain/BackApplyInfo.java | 7 +++++++ .../sgzb/app/mapper/BackReceiveMapper.java | 7 +++++++ .../sgzb/app/service/BackReceiveService.java | 7 +++++++ .../service/impl/BackReceiveServiceImpl.java | 5 +++++ .../resources/mapper/app/BackReceiveMapper.xml | 17 +++++++++++++++++ .../material/domain/PurchasePartDetails.java | 13 +++++++++++++ 7 files changed, 67 insertions(+) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java index 5e3fd293..7748f3b5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java @@ -139,6 +139,17 @@ public class BackReceiveController extends BaseController { } } + @Log(title = "退料接收-rfid编码查询", businessType = BusinessType.INSERT) + @PostMapping("rfidCodeQuery") + public AjaxResult rfidCodeQuery(@RequestBody BackApplyInfo record) { + try { + List list =backReceiveService.rfidCodeQuery(record); + return AjaxResult.success(list); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + @Log(title = "退料接收记录", businessType = BusinessType.INSERT) @PostMapping("backReceiveRecord") public AjaxResult backReceiveRecord(@RequestBody BackApplyInfo record) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java index f9c82662..7c907c63 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/BackApplyInfo.java @@ -143,7 +143,14 @@ public class BackApplyInfo { private List backApplyDetails; private Integer parentId; private String sdStatus; + /** + * 二维码编码 + */ private String qrCode; + /** + * rfid编码 + */ + private String rfidCode; private String repairedNum; private String backId; private String repairer; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java index 9c0d3836..e4c7a93a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackReceiveMapper.java @@ -57,4 +57,11 @@ public interface BackReceiveMapper { List backReceiveRecord(BackApplyInfo record); int selectCodeByMaIdAndTaskId(@Param("maId") Integer maId,@Param("taskId") Integer taskId); + + /** + * 退料接收-rfid编码查询 + * @param record + * @return List + */ + List rfidCodeQuery(BackApplyInfo record); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java index de28ab3d..ed6157af 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackReceiveService.java @@ -21,4 +21,11 @@ public interface BackReceiveService { List qrcodeQuery(BackApplyInfo record); List backReceiveRecord(BackApplyInfo record); + + /** + * 退料接收-rfid编码查询 + * @param record + * @return List + */ + List rfidCodeQuery(BackApplyInfo record); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java index e504c337..025839c8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java @@ -169,6 +169,11 @@ public class BackReceiveServiceImpl implements BackReceiveService { return backReceiveMapper.backReceiveRecord(record); } + @Override + public List rfidCodeQuery(BackApplyInfo record) { + return backReceiveMapper.rfidCodeQuery(record); + } + private int insertRad(int taskId, List wxList) { int result = 0; if(wxList !=null){ diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index d8857261..0f58cbba 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -749,5 +749,22 @@ AND bai.task_id = #{taskId} + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java index 80ea285a..8bf9cad6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchasePartDetails.java @@ -163,6 +163,11 @@ public class PurchasePartDetails extends BaseEntity @ApiModelProperty(value = "关键字筛选") private String keyWord; + /** + * 提交入库时间 + */ + private String submitStorageTime; + public void setTaskId(Long taskId) { this.taskId = taskId; @@ -447,6 +452,14 @@ public class PurchasePartDetails extends BaseEntity this.createTime = createTime; } + public String getSubmitStorageTime() { + return submitStorageTime; + } + + public void setSubmitStorageTime(String submitStorageTime) { + this.submitStorageTime = submitStorageTime; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)