From 8f574de1b5ddd397266b4dbffd4efd680a660288 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Fri, 10 Jun 2022 15:23:57 +0800
Subject: [PATCH] =?UTF-8?q?pda=20=E8=A3=85=E7=AE=B1=E5=87=BA=E5=BA=93,?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95=E6=A0=A1=E9=AA=8C=202022-0?=
 =?UTF-8?q?6-10=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gaotao/modules/finishedProduct/dao/SoReceiveBoxesDao.java | 2 +-
 .../finishedProduct/service/SoReceiveBoxesService.java        | 2 +-
 .../finishedProduct/service/impl/CRollinfoServiceImpl.java    | 2 +-
 .../service/impl/SoReceiveBoxesServiceImpl.java               | 4 ++--
 .../resources/mapper/finishedProduct/SoReceiveBoxesDao.xml    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/finishedProduct/dao/SoReceiveBoxesDao.java b/src/main/java/com/gaotao/modules/finishedProduct/dao/SoReceiveBoxesDao.java
index e88bc65..8e5837a 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/dao/SoReceiveBoxesDao.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/dao/SoReceiveBoxesDao.java
@@ -54,5 +54,5 @@ public interface SoReceiveBoxesDao extends BaseMapper<SoReceiveBoxesEntity> {
      * @Param [orderNo, orderref1, partno]
      * @return com.gaotao.modules.finishedProduct.entity.CRollinfoEntity
      **/
-    CRollinfoEntity getRollOrderNo(@Param("orderNo") Long orderNo,@Param("orderref1") String orderref1,@Param("partno") String partno);
+    CRollinfoEntity getRollOrderNo(@Param("orderNo") Long orderNo,@Param("partno") String partno);
 }
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/SoReceiveBoxesService.java b/src/main/java/com/gaotao/modules/finishedProduct/service/SoReceiveBoxesService.java
index 138fa91..f302cfc 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/SoReceiveBoxesService.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/SoReceiveBoxesService.java
@@ -114,7 +114,7 @@ public interface SoReceiveBoxesService extends IService<SoReceiveBoxesEntity> {
      * @Param [orderNo, orderref1, partno]
      * @return com.gaotao.modules.finishedProduct.entity.CRollinfoEntity
      **/
-    CRollinfoEntity getRollOrderNo(Long orderNo, String orderref1, String partno);
+    CRollinfoEntity getRollOrderNo(Long orderNo, String partno);
 
 }
 
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
index c7c50a3..3cba5ce 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/CRollinfoServiceImpl.java
@@ -722,7 +722,7 @@ public class CRollinfoServiceImpl extends ServiceImpl<CRollinfoDao, CRollinfoEnt
         }
         // 2022-06-08 提出 开启生产订单校验,一箱只能装同一个生产单的卷
         if ("Y".equals(packingVo.getOrderFlag())){
-            CRollinfoEntity orderNo = boxesService.getRollOrderNo(packingVo.getOrderNo(),cRollInfo.getOrderref1(),cRollInfo.getPartno());
+            CRollinfoEntity orderNo = boxesService.getRollOrderNo(packingVo.getOrderNo(),cRollInfo.getPartno());
             if (orderNo != null && StringUtils.isNotEmpty(orderNo.getOrderref1())){
                 if (!orderNo.getOrderref1().equals(cRollInfo.getOrderref1())){
                     return R.error("不是一个生产单号不能装入一个箱子中");
diff --git a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java
index fc989cd..0df2c9f 100644
--- a/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/finishedProduct/service/impl/SoReceiveBoxesServiceImpl.java
@@ -168,7 +168,7 @@ public class SoReceiveBoxesServiceImpl extends ServiceImpl<SoReceiveBoxesDao, So
     }
 
     @Override
-    public CRollinfoEntity getRollOrderNo(Long orderNo, String orderref1, String partno) {
-        return this.baseMapper.getRollOrderNo(orderNo, orderref1, partno);
+    public CRollinfoEntity getRollOrderNo(Long orderNo, String partno) {
+        return this.baseMapper.getRollOrderNo(orderNo, partno);
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/finishedProduct/SoReceiveBoxesDao.xml b/src/main/resources/mapper/finishedProduct/SoReceiveBoxesDao.xml
index 60c5e19..5935139 100644
--- a/src/main/resources/mapper/finishedProduct/SoReceiveBoxesDao.xml
+++ b/src/main/resources/mapper/finishedProduct/SoReceiveBoxesDao.xml
@@ -259,7 +259,7 @@
                  LEFT JOIN  so_receive_boxes  sb  on sb.box_no =  sbr.box_no
                  LEFT JOIN C_RollInfo cr on cr.RollNo = sbr.final_roll_no
         WHERE item_code = #{partno} and sb.order_no = #{orderNo}
-          and sb.status = '未封箱' and cr.OrderRef1 = #{orderref1}
+          and sb.status = '未封箱'
     </select>