pda 装箱出库,生产订单校验 2022-06-10 sxm

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);
 }

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);
 
 }
 

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("不是一个生产单号不能装入一个箱子中");

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);
     }
 }

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>