timeout bug修复

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

@@ -171,11 +171,6 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
         //库存批次信息
         List<InvLotLocIdLotattVO> invLotLocIdLotAttVOList = invLotLocIdMapper.selectInvLocIdLotattList(invLocIdSearchFrom);
         if (CollectionUtil.isEmpty(invLotLocIdLotAttVOList)) return invLotLocIdLotAttVOList;
-
-        // 物料信息
-        List<BaseSku> baseSkuList = baseSkuService.selectBaseSkuList(new BaseSku());
-        Map<String, BaseSku> baseSkuMap = baseSkuList.stream().collect(Collectors.toMap(BaseSku::getSku, Function.identity()));
-
         //托盘信息
         String isFull = StringUtils.isNotBlank(invLocIdSearchFrom.getIsFull()) ? invLocIdSearchFrom.getIsFull(): null;
         List<WmsBoxInfo> wmsBoxInfoList = iWmsBoxInfoService.queryWmsBoxInfoByPalletNoList(invLotLocIdLotAttVOList.stream().filter(item ->
@@ -196,9 +191,6 @@ public class InvLotLocIdServiceImpl extends CrudServiceImpl<InvLotLocIdMapper, I
             item.setStockStatus(baseLocationInfoMap.get(item.getLocationId()).getStockStatus());
             item.setZoneId(baseLocationInfoMap.get(item.getLocationId()).getZoneId().toString());
             item.setIsFull(wmsBoxInfoMap.get(item.getLotatt07()).getIsFull());
-            BaseSku baseSku = baseSkuMap.get(item.getSku());
-            item.setSkuName(baseSku.getDesc1());
-            item.setSkuModel(baseSku.getModel());
         });
         return invLotLocIdLotAttVOList;
     }

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

@@ -446,7 +446,7 @@
 
     <select id="selectInvLocIdLotattByLocationId" resultMap="InvLotLocIdLotattResult">
         select
-            inv.location_id,sk.sku,sk.model sku_model,sk.desc1 sku_name,b.location_no,inv.qty,inv.qtyallocated
+            inv.location_id,sk.specs,sk.sku,sk.model sku_model,sk.desc1 sku_name,b.location_no,inv.qty,inv.qtyallocated
             ,att.lotnum, att.customer_id
              , lotatt01, lotatt02, lotatt03, lotatt04,qua.dict_label lotatt05, lotatt06, lotatt07, lotatt08
              , lotatt09, lotatt10, lotatt11, lotatt12, lotatt13, lotatt14, lotatt15, lotatt16, lotatt17, lotatt18

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

@@ -122,10 +122,10 @@
             <if test="material != null  and material != ''"> and material like concat('%', #{material}, '%')</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="params.beginTime != null and params.beginTime != ''">
-                AND date_format(t1.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
             </if>
             <if test="params.endTime != null and params.endTime != ''">
-                AND date_format(t1.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
             </if>
         </where>
         order by create_time desc