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

sckw-modules/sckw-product/src/main/java/com/sckw/product/dubbo/GoodsInfoServiceImpl.java

@@ -61,7 +61,7 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
             return HttpResult.error("业务繁忙，请稍后再试!");
         }
         try {
-            com.sckw.product.model.KwpGoods goods = kwpGoodsService.selectById(id);
+            com.sckw.product.model.KwpGoods goods = kwpGoodsService.getOnShelfGoodsById(id);
             if (Objects.isNull(goods)) {
                 return HttpResult.error("商品不存在!");
             }
@@ -69,7 +69,8 @@ public class GoodsInfoServiceImpl implements GoodsInfoService {
             if (goods.getAmount().compareTo(amount) < 0) {
                 return HttpResult.error("商品库存不足，请联系供应方!");
             }
-            goods.setAmount(goodsAmount.subtract(amount)).setPerformedAmount(Objects.nonNull(goods.getPerformedAmount()) ? goods.getPerformedAmount().add(amount) : amount);
+            goods.setAmount(goodsAmount.subtract(amount))
+                    .setPerformedAmount(Objects.nonNull(goods.getPerformedAmount()) ? goods.getPerformedAmount().add(amount) : amount);
             kwpGoodsService.updateById(goods);
         } finally {
             RedissonUtils.unlock(lockKey);

sckw-modules/sckw-product/src/main/java/com/sckw/product/service/KwpGoodsService.java

@@ -978,15 +978,17 @@ public class KwpGoodsService {
     }
 
     /**
-     * @desc: 根据商品id获取未删除商品信息
+     * @desc: 根据商品id获取上架商品信息
      * @author: yzc
      * @date: 2023-07-13 15:08
      * @Param id:
      * @return: com.sckw.product.model.KwpGoods
      */
-    public KwpGoods selectGoodsById(Long id) {
+    public KwpGoods getOnShelfGoodsById(Long id) {
         LambdaQueryWrapper<KwpGoods> wrapper = new LambdaQueryWrapper<>();
-        LambdaQueryWrapper<KwpGoods> last = wrapper.eq(KwpGoods::getId, id).eq(KwpGoods::getDelFlag, Global.NO).last("LIMIT 1");
+        LambdaQueryWrapper<KwpGoods> last = wrapper.eq(KwpGoods::getId, id)
+                .eq(KwpGoods::getStatus, GoodsStatusEnum.PUT_ON_SHELVES.getCode())
+                .eq(KwpGoods::getDelFlag, Global.NO).last("LIMIT 1");
         return kwpGoodsMapper.selectOne(last);
     }
 

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/ManagementWaybillOrderQuery.java

@@ -60,6 +60,30 @@ public class ManagementWaybillOrderQuery extends PageRequest implements Serializ
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endEndTime;
 
+    /**
+     * 装载开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startLoadTime;
+
+    /**
+     * 装载结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endLoadTime;
+
+    /**
+     * 卸载开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startUnloadTime;
+
+    /**
+     * 卸载结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endUnloadTime;
+
     /**
      * 关键字搜索
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ManagementWaybillOrderService.java

@@ -93,6 +93,25 @@ public class ManagementWaybillOrderService {
         } else if (Objects.nonNull(query.getEndEndTime())) {
             criteria.and("endTime").lte(DateUtil.offsetDay(query.getEndEndTime(), 1));
         }
+
+        // 装载时间
+        if (Objects.nonNull(query.getStartLoadTime()) && Objects.nonNull(query.getEndLoadTime())) {
+            criteria.and("loadTime").gte(query.getStartLoadTime()).lte(DateUtil.offsetDay(query.getEndLoadTime(), 1));
+        } else if (Objects.nonNull(query.getStartLoadTime())) {
+            criteria.and("loadTime").gte(query.getStartLoadTime());
+        } else if (Objects.nonNull(query.getEndLoadTime())) {
+            criteria.and("loadTime").lte(DateUtil.offsetDay(query.getEndLoadTime(), 1));
+        }
+
+        // 卸货时间
+        if (Objects.nonNull(query.getStartUnloadTime()) && Objects.nonNull(query.getEndUnloadTime())) {
+            criteria.and("unloadTime").gte(query.getStartUnloadTime()).lte(DateUtil.offsetDay(query.getEndUnloadTime(), 1));
+        } else if (Objects.nonNull(query.getStartUnloadTime())) {
+            criteria.and("unloadTime").gte(query.getStartUnloadTime());
+        } else if (Objects.nonNull(query.getEndUnloadTime())) {
+            criteria.and("unloadTime").lte(DateUtil.offsetDay(query.getEndUnloadTime(), 1));
+        }
+
         // 多条件模糊查询
         List<Criteria> orCriteria = new ArrayList<>();
         if (StringUtils.isNotBlank(query.getKeywords())) {