From 476eaf3a81a3a71a7b63bbd40fc537430385f7a6 Mon Sep 17 00:00:00 2001
From: syruan <321359594@qq.com>
Date: Fri, 10 Jan 2025 14:07:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E7=AE=B1=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=96=B0=E8=B4=AD=E6=89=B9=E6=AC=A1=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/controller/BmQrBoxController.java     |  2 +-
 .../material/basic/mapper/BmQrBoxMapper.java    |  7 +++++++
 .../basic/service/impl/BmQrBoxServiceImpl.java  | 11 ++++++++++-
 .../bonus/material/ma/domain/vo/MachineVo.java  |  3 +++
 .../mapper/material/basic/BmQrBoxMapper.xml     | 17 +++++++++++++++--
 5 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java
index 0a03921b..4be1525b 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmQrBoxController.java
@@ -166,7 +166,7 @@ public class BmQrBoxController extends BaseController {
      * APP -- 扫码绑定机具
      */
     @ApiOperation(value = "APP -- 扫码绑定机具")
-    @PreventRepeatSubmit
+//    @PreventRepeatSubmit
     //@RequiresPermissions("basic:qrBox:edit")
     @SysLog(title = "APP-二维码标准箱管理", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->APP扫码绑定机具")
     @PostMapping("/app_bind_ma")
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java
index 1d298ce8..04f8efd5 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java
@@ -52,6 +52,13 @@ public interface BmQrBoxMapper {
      */
     List<Long> getBoxMaTypeList(Long boxId);
 
+    /**
+     * 根据标准箱ID查询标准箱已绑定物资的任务ID
+     * @param boxId 标准箱id
+     * @return 标准箱物资的绑定批次 buyTask
+     */
+    Long getBoxBindMaBuyTaskByBoxId(Long boxId);
+
     /**
      * 查询此机具是否已经被标准箱绑定过
      */
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
index 8800bd98..98601532 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java
@@ -357,8 +357,17 @@ public class BmQrBoxServiceImpl implements BmQrBoxService {
                 return AjaxResult.error("物资状态非在库或待入库状态,无法操作:" + machineVo.getMaStatus());
             }
 
+            // 物资的新购批次判断，是否和Box标准箱内已存在的是同一批
+            if (null == machineVo.getBuyTask()) {
+                return AjaxResult.error("物资未关联采购批次，请完善后重试!");
+            }
+            Long boxBindMaBuyTaskId = bmQrBoxMapper.getBoxBindMaBuyTaskByBoxId(bmQrBoxInfo.getBoxId());
+            if (null != boxBindMaBuyTaskId && !Objects.equals(boxBindMaBuyTaskId, machineVo.getBuyTask())) {
+                return AjaxResult.error("该物资批次与标准箱已存在批次不匹配，请完善后重试!");
+            }
+
             // 此物资未在其他标准型入过库，才可以绑定
-            if (bmQrBoxMapper.existsMaId(machineVo.getMaId()) > 0) {
+            if (0 < bmQrBoxMapper.existsMaId(machineVo.getMaId())) {
                 return AjaxResult.error("该物资已绑定其他标准箱，无法再次绑定!");
             }
 
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
index 8cdd489a..b91a4ca5 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java
@@ -42,4 +42,7 @@ public class MachineVo extends Machine {
     @ApiModelProperty("状态名称")
     private String statusName;
 
+    @ApiModelProperty("购置批次")
+    private Long buyTask;
+
 }
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
index cc8c068c..bf969b57 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml
@@ -223,13 +223,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMaInfoByQrCode" resultType="com.bonus.material.basic.domain.BmQrBoxInfo">
         select
-            bqi.id, bqi.qr_code, bqi.type_id as maTypeId, bqi.ma_code , mm.ma_id, mm.ma_status
+            bqi.id, bqi.qr_code, bqi.type_id as maTypeId, bqi.ma_code, mm.ma_id, mm.ma_status
         from
             bm_qrcode_info bqi
         left join
             ma_machine mm on bqi.type_id = mm.type_id and bqi.ma_code = mm.ma_code
         where
-            bqi.del_flag is null or bqi.del_flag = '0'
+            bqi.del_flag is null or bqi.del_flag = '0' and bqi.qr_code = #{qrCode}
         group by
             bqi.id limit 1
     </select>
@@ -255,4 +255,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             bqb.box_code = #{boxCode} AND
             mt.type_id = #{maTypeId}
     </select>
+
+    <select id="getBoxBindMaBuyTaskByBoxId" resultType="java.lang.Long">
+        select
+            mm.buy_task
+        from
+            bm_qrcode_box_bind qbb
+        LEFT JOIN
+            ma_machine mm ON mm.ma_id = qbb.ma_id
+        where
+            qbb.box_id = #{boxId}
+        group by
+            qbb.box_id LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file