订单调整

src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java

@@ -62,6 +62,7 @@ public class GoodsCategoryRuleController {
             lqw.like(GoodsCategoryRule::getBrandNames,param.getBrandName());
         }
         PageUtil.startPage();
+        lqw.orderByDesc(GoodsCategoryRule::getSort);
         List<GoodsCategoryRule> list = goodsCategoryRuleService.list(lqw);
         return R.byPageHelperList(list);
     }

src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java

@@ -55,6 +55,8 @@ public class GoodsCategoryRule implements Serializable {
     @Length(max = 255,message = "备注长度不能超过255字")
     private String remark;
 
+    private Integer sort;
+
     /** 创建时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")

src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java

@@ -468,13 +468,13 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         spLqw.eq(SalePlan::getYearNum,year);
         spLqw.eq(SalePlan::getMonthNum,month);
         spLqw.eq(SalePlan::getSupplierId,supplierId);
-        spLqw.eq(SalePlan::getPlanState,1);
+        //spLqw.eq(SalePlan::getPlanState,1);
         List<SalePlan> salePlanList = salePlanMapper.selectList(spLqw);
         Map<Long,Integer> spuIdAndSum = new HashMap<>();
         if(salePlanList.size()>0){
             List<Long> spIds = salePlanList.stream().map(SalePlan::getId).collect(Collectors.toList());
             LambdaQueryWrapper<SalePlanGoods> spgLqw = new LambdaQueryWrapper<>();
-            spgLqw.eq(SalePlanGoods::getPlanId,spIds);
+            spgLqw.in(SalePlanGoods::getPlanId,spIds);
             spgLqw.in(SalePlanGoods::getTargetId,spuIds);
             List<SalePlanGoods> salePlanGoodsList = salePlanGoodsMapper.selectList(spgLqw);
             for (SalePlanGoods planGoods : salePlanGoodsList) {

src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java

@@ -58,6 +58,7 @@ public class SalePlanController {
     public R<PageVo<SalePlan>> getPage(SalePlan param){
         LambdaQueryWrapper<SalePlan> lqw = new LambdaQueryWrapper<>(param);
         PageUtil.startPage();
+        lqw.orderByDesc(SalePlan::getId);
         List<SalePlan> list = salePlanService.list(lqw);
         return R.byPageHelperList(list);
     }
@@ -93,6 +94,22 @@ public class SalePlanController {
         return R.ok(salePlan);
     }
 
+    /**
+     * 启用
+     * @param id
+     * @return
+     */
+    @PostMapping("/start/{id}")
+    @SysLog(module = SystemModule.SALE, title = "销售计划", biz = BizType.UPDATE)
+    public R<?> start(@PathVariable Long id){
+        SalePlan salePlan = new SalePlan();
+        salePlan.setId(id);
+        salePlan.setPlanState(1);
+        salePlanService.updateById(salePlan);
+        return R.ok(salePlan);
+    }
+
+
     /**
     * 新增
     * @param param