fix:完善修改功能

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/controller/ProductionPlanController.java

@@ -2,6 +2,8 @@ package org.dromara.productionManagement.controller;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
@@ -39,6 +41,7 @@ public class ProductionPlanController extends BaseController {
      * @param outFactory 数码印花厂id
      * @return 结果
      */
+    @Log(title = "更新数码印花厂", businessType = BusinessType.UPDATE)
     @PutMapping("/outFactory")
     public R<Void> updateOutFactory(@RequestParam Long id, @RequestParam int outFactory){
         return toAjax(productionPlanService.updateOutFactory(id, outFactory));
@@ -50,6 +53,7 @@ public class ProductionPlanController extends BaseController {
      * @param SHFactory 烧花厂id
      * @return 结果
      */
+    @Log(title = "更新烧花厂", businessType = BusinessType.UPDATE)
     @PutMapping("/SHFactory")
     public R<Void> updateSHFactory(@RequestParam Long id, @RequestParam int SHFactory){
         return toAjax(productionPlanService.updateSHFactory(id, SHFactory));
@@ -61,6 +65,7 @@ public class ProductionPlanController extends BaseController {
      * @param craftStatus 订单状态码
      * @return 结果
      */
+    @Log(title = "更新订单状态", businessType = BusinessType.UPDATE)
     @PutMapping("/craftStatus")
     public R<Void> updateCraftStatus(@RequestParam Long id, @RequestParam int craftStatus){
         return toAjax(productionPlanService.updateCraftStatus(id, craftStatus));
@@ -72,6 +77,7 @@ public class ProductionPlanController extends BaseController {
      * @param printStatus 打印状态码
      * @return 结果
      */
+    @Log(title = "更新打印状态", businessType = BusinessType.UPDATE)
     @PutMapping("/printStatus")
     public R<Void> updatePrintStatus(@RequestParam Long id, @RequestParam int printStatus){
         return toAjax(productionPlanService.updatePrintStatus(id, printStatus));
@@ -83,6 +89,7 @@ public class ProductionPlanController extends BaseController {
      * @param deliveryTime 发货时间
      * @return 结果
      */
+    @Log(title = "更新发货时间", businessType = BusinessType.UPDATE)
     @PutMapping("/deliveryTime")
     public R<Void> updateDeliveryTime(@RequestParam Long id, @RequestParam Date deliveryTime){
         return toAjax(productionPlanService.updateDeliveryTime(id, deliveryTime));
@@ -94,9 +101,45 @@ public class ProductionPlanController extends BaseController {
      * @param confirmDeliveryTime 确认收货时间
      * @return 结果
      */
+    @Log(title = "更新确认收货时间", businessType = BusinessType.UPDATE)
     @PutMapping("/confirmDeliveryTime")
     public R<Void> updateConfirmDeliveryTime(@RequestParam Long id, @RequestParam Date confirmDeliveryTime){
         return toAjax(productionPlanService.updateConfirmDeliveryTime(id, confirmDeliveryTime));
     }
 
+    /**
+     * 更新作废状态
+     * @param id 订单id
+     * @param voidStatus 作废状态码
+     * @return 结果
+     */
+    @Log(title = "更新作废状态", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeVoidStatus")
+    public R<Void> changeVoidStatus(@RequestParam Long id, @RequestParam int voidStatus){
+        return toAjax(productionPlanService.changeVoidStatus(id, voidStatus));
+    }
+
+    /**
+     * 更新发货数量
+     * @param id 订单id
+     * @param shipNumber 发货数量
+     * @return 结果
+     */
+    @Log(title = "更新发货数量", businessType = BusinessType.UPDATE)
+    @PutMapping("/shipNumber")
+    public R<Void> updateShipNumber(@RequestParam Long id, @RequestParam int shipNumber){
+        return toAjax(productionPlanService.updateShipNumber(id, shipNumber));
+    }
+
+    /**
+     * 更新订单数量
+     * @param id 订单id
+     * @param number 订单数量
+     * @return 结果
+     */
+    @Log(title = "更新订单数量", businessType = BusinessType.UPDATE)
+    @PutMapping("/number")
+    public R<Void> updateNumber(@RequestParam Long id, @RequestParam double number){
+        return toAjax(productionPlanService.updateNumber(id, number));
+    }
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/ProductionPlanService.java

@@ -67,4 +67,28 @@ public interface ProductionPlanService {
      * @return 结果
      */
     int updateConfirmDeliveryTime(Long id, Date confirmDeliveryTime);
+
+    /**
+     * 更新作废状态
+     * @param id 订单id
+     * @param voidStatus 作废状态码
+     * @return 结果
+     */
+    int changeVoidStatus(Long id, int voidStatus);
+
+    /**
+     * 更新发货数量
+     * @param id 订单id
+     * @param shipNumber 发货数量
+     * @return 结果
+     */
+    int updateShipNumber(Long id, int shipNumber);
+
+    /**
+     * 更新订单数量
+     * @param id 订单id
+     * @param number 数量
+     * @return 结果
+     */
+    int updateNumber(Long id, double number);
 }

ruoyi-modules/ruoyi-productionManagementOfBulkOrders/src/main/java/org/dromara/productionManagement/service/impl/ProductionPlanServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.domain.BulkOrderPlan;
+import org.dromara.bulk.mapper.BulkOrderPlanMapper;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -24,6 +26,7 @@ import java.util.Map;
 public class ProductionPlanServiceImpl implements ProductionPlanService {
 
     private final ProductionPlanMapper productionPlanMapper;
+    private final BulkOrderPlanMapper bulkOrderPlanMapper;
 
     /**
      * 分页查询生产计划
@@ -35,6 +38,7 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
     public TableDataInfo<ProductionPlanVo> selectVoPage(Map<String,Object> params, PageQuery pageQuery) {
         QueryWrapper<ProductionPlan> qw = new QueryWrapper<>();
         qw.eq("p.craft_status",params.get("craftStatus"));
+        qw.eq(null != params.get("planId"), "p.id", params.get("planId"));
         qw.eq(null != params.get("userId"),"p.user_id", params.get("userId"));
         qw.eq(StringUtils.isNotBlank((CharSequence) params.get("garmentFactory")),"gi.garment_factory", params.get("garmentFactory"));
         qw.like(StringUtils.isNotBlank((CharSequence) params.get("scNo")),"p.sc_no", params.get("scNo"));
@@ -138,4 +142,43 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
         uw.eq("id", id).set("confirm_delivery_time", confirmDeliveryTime);
         return productionPlanMapper.update(uw);
     }
+
+    /**
+     * 更新作废状态
+     * @param id 订单id
+     * @param voidStatus 作废状态码
+     * @return 结果
+     */
+    @Override
+    public int changeVoidStatus(Long id, int voidStatus) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("is_to_void", voidStatus);
+        return productionPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新发货数量
+     * @param id 订单id
+     * @param shipNumber 发货数量
+     * @return 结果
+     */
+    @Override
+    public int updateShipNumber(Long id, int shipNumber) {
+        UpdateWrapper<BulkOrderPlan> uw = new UpdateWrapper<>();
+        uw.eq("plan_id", id).set("ship_num", shipNumber);
+        return bulkOrderPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新订单数量
+     * @param id 订单id
+     * @param number 数量
+     * @return 结果
+     */
+    @Override
+    public int updateNumber(Long id, double number) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("number", number);
+        return productionPlanMapper.update(uw);
+    }
 }