测试修改

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

@@ -271,7 +271,7 @@ public class ActAllocationDetailsServiceImpl implements IActAllocationDetailsSer
             actAllocationQuery.setOrderNo(orderNo);
             actAllocationQuery.setLocationId(locationId);
             actAllocationQuery.setLotatt07(palletNo);
-            actAllocationQuery.setStatus(Constant.ORDER_STS.STS21.getValue());
+            actAllocationQuery.setStatus(Constant.ORDER_STS.STS20.getValue());
             List<ActAllocationDetailsFrom> actAllocationDetailsFromList = this.selectActAllocationDetailsInvLotAttList(actAllocationQuery);
             for (ActAllocationDetailsFrom allocationDetails : actAllocationDetailsFromList) {
                 ActAllocationDetails allocationDetailsUpdate = new ActAllocationDetails();

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

@@ -1204,6 +1204,10 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             query.setStatus(Constant.ORDER_STS.STS30.getValue());
             actAllocationDetailsFrom = actAllocationDetailsService.selectActAllocationDetailsInvLotAttByModel(query);
         }
+        if (actAllocationDetailsFrom == null) {
+            query.setStatus(Constant.ORDER_STS.STS40.getValue());
+            actAllocationDetailsFrom = actAllocationDetailsService.selectActAllocationDetailsInvLotAttByModel(query);
+        }
         if (actAllocationDetailsFrom != null) {
             codeSkuRelationshipSoVO.setOrderNo(actAllocationDetailsFrom.getOrderNo());
             codeSkuRelationshipSoVO.setSku(actAllocationDetailsFrom.getMaterial());

warewms-ams/src/main/resources/mapper/docOrder/WmsDocOrderHeaderMapper.xml

@@ -142,7 +142,7 @@
 
     <resultMap type="com.ruoyi.ams.order.vo.CheckOutVO" id="CheckOutVOResult">
         <result property="orderNo"    column="order_no"    />
-        <result property="palletNo"    column="box_no"    />
+        <result property="palletNo"    column="palletNo"    />
         <result property="locationNo"    column="location_no"    />
     </resultMap>
 
@@ -376,19 +376,18 @@
 
     <select id="selectCheckOutList" parameterType="java.util.List" resultMap="CheckOutVOResult">
         select
-               de.order_no,w.box_no,b.location_no
+               de.order_no,b.location_no,att.lotatt07 palletNo
         from wms_doc_order_details de
         left join base_sku sk on de.sku = sk.sku
         left join act_allocation_details act on de.order_no = act.order_no and de.order_line_no = act.line_no
         right join inv_lot_loc_id lotinv on lotinv.sku = de.sku and lotinv.lotnum = act.lotnum and lotinv.location_id = act.location_id
         left join inv_lot_att att on act.lotnum = att.lotnum
-        left join wms_box_info w on act.location_id = w.location_id
         left join base_location_info b on b.id = act.location_id
         where de.order_no in
         <foreach item="orderNo" collection="list" open="(" separator="," close=")">
             #{orderNo}
         </foreach>
         and act.`status` = '20' and b.stock_status = '00' and b.is_empty = 'N'
-        group by de.order_no,w.box_no,b.location_no
+        group by de.order_no,b.location_no,att.lotatt07
     </select>
 </mapper>