Merge remote-tracking branch 'origin/yonghu' into yonghu

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaController.java

@@ -137,7 +137,7 @@ public class PdaController {
             // 只有备货单才能备货
             WmsDocOrderHeader wmsDocOrderHeader = wmsDocOrderHeaderService.selectWmsDocOrderHeaderByOrderNo(orderNo);
             if (wmsDocOrderHeader != null
-                    && wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())) {
+                    && !wmsDocOrderHeader.getOrderType().equals(Constant.ORDER_TYP.BH.getValue())) {
                 return AjaxResult.error("出库单类型为备货单才能备货！");
             }
             stockForm.setOrderNo(orderNo);

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -376,6 +376,9 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
                 return AjaxResult.error("没有可以接收的入库单,产品 ：" + codeSkuRelationshipVO.getSku());
             } else {
                 for (WmsDocAsnDetails details : list) {
+                    if (totalQty.compareTo(BigDecimal.ZERO) == 0) {
+                        return AjaxResult.success("");
+                    }
                     // 成品条码，扫码新托盘的时候，自动解绑老托盘数据。
                     if (codeSkuRelationshipVO.isProduct()) {
                         InvLotAtt attQuery = new InvLotAtt();
@@ -397,7 +400,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
                                 unlockForm.setLotnum(locIdLotattVO.getLotnum());
                                 AjaxResult ajaxResultJB = unloadStock(unlockForm);
                                 if (!ajaxResultJB.isSuccess()) {
-                                    throw new ServiceException("解绑老托盘失败：" + ajaxResult.getMsg());
+                                    throw new ServiceException("解绑老托盘失败：" + ajaxResultJB.getMsg());
                                 }
                             }
                         }
@@ -848,6 +851,9 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             List<WmsDocAsnDetails> detailsList = wmsDocAsnDetailsMapper.selectWmsDocAsnDetailsList(query);
             if (detailsList != null && detailsList.size() > 0) {
                 for (WmsDocAsnDetails de : detailsList) {
+                    if (de.getExpectedQty().compareTo(de.getReceivedQty()) != 0) {
+                        continue;
+                    }
                     de.setLineStatus(Constant.ASN_STS.STS60.getValue());
                     wmsDocAsnDetailsMapper.updateWmsDocAsnDetails(de);
                 }

warewms-ams/src/main/java/com/ruoyi/ams/box/service/impl/WmsBoxInfoServiceImpl.java

@@ -174,7 +174,13 @@ public class WmsBoxInfoServiceImpl implements IWmsBoxInfoService {
 
     @Override
     public WmsBoxInfo selectByLocationId(String locationId) {
-        WmsBoxInfo wmsBoxInfo = wmsBoxInfoMapper.selectByLocationId(locationId);
+        WmsBoxInfo wmsBoxInfo = new WmsBoxInfo();
+        wmsBoxInfo.setLocationId(Long.valueOf(locationId));
+        List<WmsBoxInfo> wmsBoxInfos = wmsBoxInfoMapper.selectWmsBoxInfoList(wmsBoxInfo);
+//        WmsBoxInfo wmsBoxInfo = wmsBoxInfoMapper.selectByLocationId(locationId);
+        if (wmsBoxInfos.size() > 0) {
+            return wmsBoxInfos.get(0);
+        }
         return wmsBoxInfo;
     }
 

warewms-ams/src/main/java/com/ruoyi/ams/inv/domain/form/InvLocIdSearchFrom.java

@@ -73,6 +73,7 @@ public class InvLocIdSearchFrom {
 
     public void setLotatt07(String lotatt07) {
         this.lotatt07 = lotatt07;
+        this.lotattDTO.setLotatt07(lotatt07);
     }
 
     public String getLotatt08() {
@@ -81,6 +82,8 @@ public class InvLocIdSearchFrom {
 
     public void setLotatt08(String lotatt08) {
         this.lotatt08 = lotatt08;
+        this.lotattDTO.setLotatt08(lotatt08);
+
     }
 
     public String getLotatt14() {
@@ -89,6 +92,7 @@ public class InvLocIdSearchFrom {
 
     public void setLotatt14(String lotatt14) {
         this.lotatt14 = lotatt14;
+        this.lotattDTO.setLotatt14(lotatt14);
     }
 
     public String getLotatt15() {
@@ -97,5 +101,6 @@ public class InvLocIdSearchFrom {
 
     public void setLotatt15(String lotatt15) {
         this.lotatt15 = lotatt15;
+        this.lotattDTO.setLotatt15(lotatt15);
     }
 }

warewms-ams/src/main/java/com/ruoyi/ams/inv/mapper/InvLotLocIdMapper.java

@@ -269,7 +269,7 @@ public interface InvLotLocIdMapper {
      * @param invLotAtt
      * @return
      */
-    List<InvLotLocIdLotattVO> queryInvLotattByInvLotatt(@Param("lotattDTO") InvLotAtt invLotAtt);
+    List<InvLotLocIdLotattVO> queryInvLotattByInvLotatt(InvLotAtt invLotAtt);
 
     /**
      * 查询

warewms-ams/src/main/java/com/ruoyi/ams/inv/service/impl/InvLotLocIdServiceImpl.java

@@ -353,7 +353,6 @@ public class InvLotLocIdServiceImpl implements IInvLotLocIdService {
         WmsBoxInfo wmsBoxInfo = iWmsBoxInfoService.selectByLocationId(baseLocationInfo.getId().toString());
         if(wmsBoxInfo != null) {
             wmsBoxInfo.setIsFull("N");
-            wmsBoxInfo.setLocationId(Constant.LOC_SORTATION_CACHE);
             wmsBoxInfo.setIsEmpty("Y");
             wmsBoxInfo.setUpdateBy(updateBy);
             iWmsBoxInfoService.updateWmsBoxInfoIsNull(wmsBoxInfo);

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -1635,8 +1635,11 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             List<WmsDocOrderDetails> detailsList = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsList(query);
             if (detailsList != null && detailsList.size() > 0) {
                 for (WmsDocOrderDetails de : detailsList) {
-                    de.setLineStatus(Constant.ORDER_STS.STS99.getValue());
-                    wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(de);
+                    if (de.getQtyOrdered().compareTo(de.getQtyAllocated()) == 0
+                            && de.getQtyAllocated().compareTo(de.getQtySoftAllocated()) == 0) {
+                        de.setLineStatus(Constant.ORDER_STS.STS99.getValue());
+                        wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(de);
+                    }
                 }
             }
             //修改头单状态
@@ -1725,6 +1728,9 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                 // 明细
                 List<WmsDocOrderDetails> wmsDocOrderDetails = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
                 for (WmsDocOrderDetails wmsDocOrderDetail : wmsDocOrderDetails) {
+                    if(qty.compareTo(BigDecimal.ZERO) == 0){
+                        break;
+                    }
                     // 部分分配，完全分配
                     if (wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS10.getValue())
                             || wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS20.getValue())) {
@@ -1742,33 +1748,37 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                                 if(wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS20.getValue())) {
                                     detailsUpdate.setLineStatus(Constant.ORDER_STS.STS23.getValue());
                                 }
+                                wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
+                                break;
                             } else if (qty.compareTo(toQty) == 1) {
                                 qty = qty.subtract(toQty);
                                 detailsUpdate.setQtySoftAllocated(wmsDocOrderDetail.getQtyAllocated());
                                 if(wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS20.getValue())) {
                                     detailsUpdate.setLineStatus(Constant.ORDER_STS.STS23.getValue());
                                 }
+                                wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
                             } else {
                                 detailsUpdate.setQtySoftAllocated(wmsDocOrderDetail.getQtySoftAllocated().add(qty));
+                                wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
+                                break;
                             }
-                            wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
-                            //修改头单状态
-                            String soStatus = Constant.ORDER_STS.STS23.getValue();
-                            List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
-                            for (WmsDocOrderDetails d : wmsDocOrderDetailsList) {
-                                if (!d.getLineStatus().equals(Constant.ORDER_STS.STS23.getValue())) {
-                                    soStatus = Constant.ORDER_STS.STS22.getValue();
-                                    break;
-                                }
-                            }
-                            WmsDocOrderHeader headerUpdate = new WmsDocOrderHeader();
-                            headerUpdate.setOrderNo(orderNo);
-                            headerUpdate.setOrderStatus(soStatus);
-                            headerUpdate.setUpdateTime(new Date());
-                            wmsDocOrderHeaderMapper.updateWmsDocOrderHeader(headerUpdate);
                         }
                     }
                 }
+                //修改头单状态
+                String soStatus = Constant.ORDER_STS.STS23.getValue();
+                List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
+                for (WmsDocOrderDetails d : wmsDocOrderDetailsList) {
+                    if (!d.getLineStatus().equals(Constant.ORDER_STS.STS23.getValue())) {
+                        soStatus = Constant.ORDER_STS.STS22.getValue();
+                        break;
+                    }
+                }
+                WmsDocOrderHeader headerUpdate = new WmsDocOrderHeader();
+                headerUpdate.setOrderNo(orderNo);
+                headerUpdate.setOrderStatus(soStatus);
+                headerUpdate.setUpdateTime(new Date());
+                wmsDocOrderHeaderMapper.updateWmsDocOrderHeader(headerUpdate);
 
             }
         }
@@ -1781,6 +1791,9 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         // 明细
         List<WmsDocOrderDetails> wmsDocOrderDetails = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
         for (WmsDocOrderDetails wmsDocOrderDetail : wmsDocOrderDetails) {
+            if(qty.compareTo(BigDecimal.ZERO) == 0){
+                break;
+            }
             // 部分分配，完全分配
             if (wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS10.getValue())
                     || wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS20.getValue())) {
@@ -1798,33 +1811,37 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                         if(wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS20.getValue())) {
                             detailsUpdate.setLineStatus(Constant.ORDER_STS.STS23.getValue());
                         }
+                        wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
+                        break;
                     } else if (qty.compareTo(toQty) == 1) {
                         qty = qty.subtract(toQty);
                         detailsUpdate.setQtySoftAllocated(wmsDocOrderDetail.getQtyAllocated());
                         if(wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS20.getValue())) {
                             detailsUpdate.setLineStatus(Constant.ORDER_STS.STS23.getValue());
                         }
+                        wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
                     } else {
                         detailsUpdate.setQtySoftAllocated(wmsDocOrderDetail.getQtySoftAllocated().add(qty));
+                        wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
+                        break;
                     }
-                    wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
-                    //修改头单状态
-                    String soStatus = Constant.ORDER_STS.STS23.getValue();
-                    List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
-                    for (WmsDocOrderDetails d : wmsDocOrderDetailsList) {
-                        if (!d.getLineStatus().equals(Constant.ORDER_STS.STS23.getValue())) {
-                            soStatus = Constant.ORDER_STS.STS22.getValue();
-                            break;
-                        }
-                    }
-                    WmsDocOrderHeader headerUpdate = new WmsDocOrderHeader();
-                    headerUpdate.setOrderNo(orderNo);
-                    headerUpdate.setOrderStatus(soStatus);
-                    headerUpdate.setUpdateTime(new Date());
-                    wmsDocOrderHeaderMapper.updateWmsDocOrderHeader(headerUpdate);
                 }
             }
         }
+        //修改头单状态
+        String soStatus = Constant.ORDER_STS.STS23.getValue();
+        List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
+        for (WmsDocOrderDetails d : wmsDocOrderDetailsList) {
+            if (!d.getLineStatus().equals(Constant.ORDER_STS.STS23.getValue())) {
+                soStatus = Constant.ORDER_STS.STS22.getValue();
+                break;
+            }
+        }
+        WmsDocOrderHeader headerUpdate = new WmsDocOrderHeader();
+        headerUpdate.setOrderNo(orderNo);
+        headerUpdate.setOrderStatus(soStatus);
+        headerUpdate.setUpdateTime(new Date());
+        wmsDocOrderHeaderMapper.updateWmsDocOrderHeader(headerUpdate);
 
         return AjaxResult.success();
     }
@@ -1834,6 +1851,9 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         // 明细
         List<WmsDocOrderDetails> wmsDocOrderDetails = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
         for (WmsDocOrderDetails wmsDocOrderDetail : wmsDocOrderDetails) {
+            if(qty.compareTo(BigDecimal.ZERO) == 0){
+                break;
+            }
             // 创建状态，部分分配
             if (wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS00.getValue())
                     || wmsDocOrderDetail.getLineStatus().equals(Constant.ORDER_STS.STS10.getValue())) {
@@ -1853,6 +1873,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                         }else {
                             detailsUpdate.setLineStatus(Constant.ORDER_STS.STS20.getValue());
                         }
+                        wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
+                        break;
                      // 完全分配
                     } else if (qty.compareTo(toQty) == 1) {
                         qty = qty.subtract(toQty);
@@ -1864,30 +1886,32 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
                         }else {
                             detailsUpdate.setLineStatus(Constant.ORDER_STS.STS20.getValue());
                         }
-                       // 部分分配
+                        wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
+                        // 部分分配
                     } else {
                         detailsUpdate.setQtyAllocated(wmsDocOrderDetail.getQtyAllocated().add(qty));
                         detailsUpdate.setQtySoftAllocated(wmsDocOrderDetail.getQtySoftAllocated().add(qty));
                         detailsUpdate.setLineStatus(Constant.ORDER_STS.STS10.getValue());
+                        wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
+                        break;
                     }
-                    wmsDocOrderDetailsMapper.updateWmsDocOrderDetails(detailsUpdate);
-                    //修改头单状态
-                    String soStatus = Constant.ORDER_STS.STS23.getValue();
-                    List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
-                    for (WmsDocOrderDetails d : wmsDocOrderDetailsList) {
-                        if (!d.getLineStatus().equals(Constant.ORDER_STS.STS23.getValue())) {
-                            soStatus = Constant.ORDER_STS.STS22.getValue();
-                            break;
-                        }
-                    }
-                    WmsDocOrderHeader headerUpdate = new WmsDocOrderHeader();
-                    headerUpdate.setOrderNo(orderNo);
-                    headerUpdate.setOrderStatus(soStatus);
-                    headerUpdate.setUpdateTime(new Date());
-                    wmsDocOrderHeaderMapper.updateWmsDocOrderHeader(headerUpdate);
                 }
             }
         }
+        //修改头单状态
+        String soStatus = Constant.ORDER_STS.STS23.getValue();
+        List<WmsDocOrderDetails> wmsDocOrderDetailsList = wmsDocOrderDetailsMapper.selectWmsDocOrderDetailsByOrderNo(orderNo);
+        for (WmsDocOrderDetails d : wmsDocOrderDetailsList) {
+            if (!d.getLineStatus().equals(Constant.ORDER_STS.STS23.getValue())) {
+                soStatus = Constant.ORDER_STS.STS22.getValue();
+                break;
+            }
+        }
+        WmsDocOrderHeader headerUpdate = new WmsDocOrderHeader();
+        headerUpdate.setOrderNo(orderNo);
+        headerUpdate.setOrderStatus(soStatus);
+        headerUpdate.setUpdateTime(new Date());
+        wmsDocOrderHeaderMapper.updateWmsDocOrderHeader(headerUpdate);
 
         return AjaxResult.success();
     }

warewms-ams/src/main/resources/mapper/ams/InvLotLocIdMapper.xml

@@ -333,8 +333,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectInvLocIdLotattList" resultMap="InvLotLocIdLotattResult">
         select
         inv.location_id,sk.sku,sk.desc1 sku_name,sk.model sku_model,skt.item_name sku_type_name,b.location_no,inv.qty,inv.qtyallocated
-        ,att.lotnum, att.customer_id,w.box_no,w.is_full,
-        b.zone_id,b.stock_status stockStatus,b.is_empty isEmpty,z.zone_name
+        ,att.lotnum, att.customer_id,w.box_no,w.is_full
+        ,b.zone_id,b.stock_status stockStatus,b.is_empty isEmpty,z.zone_name
         ,lotatt01, lotatt02, lotatt03, lotatt04,lot05_dict.dict_label lotatt05, supp.supplier_name lotatt06
         ,lotatt07, lotatt08, lotatt09, lotatt10, lotatt11, lotatt12, lotatt13, lotatt14, lotatt15, lotatt16, lotatt17
         ,lotatt18
@@ -583,27 +583,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from inv_lot_loc_id li
         left join inv_lot_att att on li.lotnum = att.lotnum
         <where>
-            <if test="sku != null  and sku != ''"> and li.sku = #{sku}</if>
-            <if test="lotattDTO != null">
-                <if test="lotattDTO.lotatt01 != null  and lotattDTO.lotatt01 != ''"> and att.lotatt01 = #{lotattDTO.lotatt01}</if>
-                <if test="lotattDTO.lotatt02 != null  and lotattDTO.lotatt02 != ''"> and att.lotatt02 = #{lotattDTO.lotatt02}</if>
-                <if test="lotattDTO.lotatt03 != null  and lotattDTO.lotatt03 != ''"> and att.lotatt03 = #{lotattDTO.lotatt03}</if>
-                <if test="lotattDTO.lotatt04 != null  and lotattDTO.lotatt04 != ''"> and att.lotatt04 = #{lotattDTO.lotatt04}</if>
-                <if test="lotattDTO.lotatt05 != null  and lotattDTO.lotatt05 != ''"> and att.lotatt05 = #{lotattDTO.lotatt05}</if>
-                <if test="lotattDTO.lotatt06 != null  and lotattDTO.lotatt06 != ''"> and att.lotatt06 = #{lotattDTO.lotatt06}</if>
-                <if test="lotattDTO.lotatt07 != null  and lotattDTO.lotatt07 != ''"> and att.lotatt07 = #{lotattDTO.lotatt07}</if>
-                <if test="lotattDTO.lotatt08 != null  and lotattDTO.lotatt08 != ''"> and att.lotatt08 = #{lotattDTO.lotatt08}</if>
-                <if test="lotattDTO.lotatt09 != null  and lotattDTO.lotatt09 != ''"> and att.lotatt09 = #{lotattDTO.lotatt09}</if>
-                <if test="lotattDTO.lotatt10 != null  and lotattDTO.lotatt10 != ''"> and att.lotatt10 = #{lotattDTO.lotatt10}</if>
-                <if test="lotattDTO.lotatt11 != null  and lotattDTO.lotatt11 != ''"> and att.lotatt11 = #{lotattDTO.lotatt11}</if>
-                <if test="lotattDTO.lotatt12 != null  and lotattDTO.lotatt12 != ''"> and att.lotatt12 = #{lotattDTO.lotatt12}</if>
-                <if test="lotattDTO.lotatt13 != null  and lotattDTO.lotatt13 != ''"> and att.lotatt13 = #{lotattDTO.lotatt13}</if>
-                <if test="lotattDTO.lotatt14 != null  and lotattDTO.lotatt14 != ''"> and att.lotatt14 = #{lotattDTO.lotatt14}</if>
-                <if test="lotattDTO.lotatt15 != null  and lotattDTO.lotatt15 != ''"> and att.lotatt15 = #{lotattDTO.lotatt15}</if>
-                <if test="lotattDTO.lotatt16 != null  and lotattDTO.lotatt16 != ''"> and att.lotatt16 = #{lotattDTO.lotatt16}</if>
-                <if test="lotattDTO.lotatt17 != null  and lotattDTO.lotatt17 != ''"> and att.lotatt17 = #{lotattDTO.lotatt17}</if>
-                <if test="lotattDTO.lotatt18 != null  and lotattDTO.lotatt18 != ''"> and att.lotatt18 = #{lotattDTO.lotatt18}</if>
-            </if>
+                <if test="sku != null  and sku != ''"> and li.sku = #{sku}</if>
+                <if test="lotatt01 != null  and lotatt01 != ''"> and att.lotatt01 = #{lotatt01}</if>
+                <if test="lotatt02 != null  and lotatt02 != ''"> and att.lotatt02 = #{lotatt02}</if>
+                <if test="lotatt03 != null  and lotatt03 != ''"> and att.lotatt03 = #{lotatt03}</if>
+                <if test="lotatt04 != null  and lotatt04 != ''"> and att.lotatt04 = #{lotatt04}</if>
+                <if test="lotatt05 != null  and lotatt05 != ''"> and att.lotatt05 = #{lotatt05}</if>
+                <if test="lotatt06 != null  and lotatt06 != ''"> and att.lotatt06 = #{lotatt06}</if>
+                <if test="lotatt07 != null  and lotatt07 != ''"> and att.lotatt07 = #{lotatt07}</if>
+                <if test="lotatt08 != null  and lotatt08 != ''"> and att.lotatt08 = #{lotatt08}</if>
+                <if test="lotatt09 != null  and lotatt09 != ''"> and att.lotatt09 = #{lotatt09}</if>
+                <if test="lotatt10 != null  and lotatt10 != ''"> and att.lotatt10 = #{lotatt10}</if>
+                <if test="lotatt11 != null  and lotatt11 != ''"> and att.lotatt11 = #{lotatt11}</if>
+                <if test="lotatt12 != null  and lotatt12 != ''"> and att.lotatt12 = #{lotatt12}</if>
+                <if test="lotatt13 != null  and lotatt13 != ''"> and att.lotatt13 = #{lotatt13}</if>
+                <if test="lotatt14 != null  and lotatt14 != ''"> and att.lotatt14 = #{lotatt14}</if>
+                <if test="lotatt15 != null  and lotatt15 != ''"> and att.lotatt15 = #{lotatt15}</if>
+                <if test="lotatt16 != null  and lotatt16 != ''"> and att.lotatt16 = #{lotatt16}</if>
+                <if test="lotatt17 != null  and lotatt17 != ''"> and att.lotatt17 = #{lotatt17}</if>
+                <if test="lotatt18 != null  and lotatt18 != ''"> and att.lotatt18 = #{lotatt18}</if>
         </where>
     </select>
 

warewms-ams/src/main/resources/mapper/box/WmsBoxInfoMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isFull != null  and isFull != ''"> and is_full = #{isFull}</if>
             <if test="boxNo != null  and boxNo != ''"> and box_no = #{boxNo}</if>
             <if test="locationNo != null  and locationNo != ''"> and t2.location_no = #{locationNo}</if>
+            <if test="locationId != null  and locationId != ''"> and t1.location_id = #{locationId}</if>
         </where>
     </select>