Merge branch 'develop' into release

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/InventoryMonitoringController.java

@@ -1,6 +1,5 @@
 package org.dromara.InventoryManagement.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.InventoryManagement.domain.bo.InventoryMonitoringBo;
 import org.dromara.InventoryManagement.domain.vo.InventoryMonitoringVo;
@@ -15,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 库存监控接口
  */
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inventoryManagement/inventoryMonitoring")

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/PutInStorageController.java

@@ -1,7 +1,6 @@
 package org.dromara.InventoryManagement.controller;
 
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.InventoryManagement.domain.bo.StorageBo;
 import org.dromara.InventoryManagement.domain.vo.StorageVo;
@@ -12,7 +11,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.springframework.web.bind.annotation.*;
 
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/inventoryManagement/putInStorage")

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/controller/PutInStorageTypeController.java

@@ -0,0 +1,59 @@
+package org.dromara.InventoryManagement.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
+import org.dromara.InventoryManagement.service.PutInStorageTypeService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/inventoryManagement/putinstoragetype")
+public class PutInStorageTypeController extends BaseController {
+    private final PutInStorageTypeService putInStorageTypeService;
+    @GetMapping("/PageList")
+    public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery){
+        return putInStorageTypeService.selectPutInStorageTypePageList(putInStorageTypeBo,pageQuery);
+    }
+    @PostMapping
+    public R<Void> insertPutInStorageType(@RequestBody PutInStorageTypeBo putInStorageTypeBo){
+        return toAjax(putInStorageTypeService.insertPutInStorageType(putInStorageTypeBo));
+    }
+    @PutMapping
+    public R<Void> updatePutInStorageType(@RequestBody PutInStorageTypeBo putInStorageTypeBo){
+        return toAjax(putInStorageTypeService.updatePutInStorageType(putInStorageTypeBo));
+    }
+    @DeleteMapping("/{ids}")
+    public R<Void> deletePutInStorageTypeByIds(@PathVariable List<Integer> ids){
+        return toAjax(putInStorageTypeService.deletePutInStorageTypeByIds(ids));
+    }
+    @GetMapping("/recycle")
+    public TableDataInfo<PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery){
+        return putInStorageTypeService.selectRecyclePutInStorageTypeList(putInStorageTypeBo,pageQuery);
+    }
+    @PostMapping("/recycle/back/{ids}")
+    public R<Void> backPutInStorageTypeByIds(@PathVariable List<Integer> ids){
+        return toAjax(putInStorageTypeService.backPutInStorageTypeByIds(ids));
+    }
+    @PostMapping("/recycle/back/all")
+    public R<Void> backPutInStorageTypeAll(){
+        return toAjax(putInStorageTypeService.backPutInStorageTypeAll());
+    }
+    @DeleteMapping("/recycle/{ids}")
+    public R<Void> deleteRecyclePutInStorageTypeByIds(@PathVariable List<Integer> ids){
+        int status = putInStorageTypeService.deleteRecyclePutInStorageTypeByIds(ids);
+        if(status==1){
+            return toAjax(1);
+        }
+        return R.fail("该回收站中不存在此入库类型或已被删除");
+    }
+    @DeleteMapping("recycle/all")
+    public R<Void> deleteRecyclePutInStorageTypeAll(){
+        return toAjax(putInStorageTypeService.deleteRecyclePutInStorageTypeAll());
+    }
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/PutInStorageType.java

@@ -0,0 +1,30 @@
+package org.dromara.InventoryManagement.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+@Data
+@TableName("fa_ykjp_warehouse_in")
+public class PutInStorageType {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 入库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/bo/PutInStorageTypeBo.java

@@ -0,0 +1,42 @@
+package org.dromara.InventoryManagement.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.InventoryManagement.domain.PutInStorageType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+@AutoMapper(target = PutInStorageType.class, reverseConvertGenerate = false)
+public class PutInStorageTypeBo {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 入库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/domain/vo/PutInStorageTypeVo.java

@@ -0,0 +1,30 @@
+package org.dromara.InventoryManagement.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.InventoryManagement.domain.PutInStorageType;
+
+@Data
+@AutoMapper(target = PutInStorageType.class)
+public class PutInStorageTypeVo {
+    /**
+     * ID
+     */
+    private int ID;
+    /**
+     * 入库类型
+     */
+    private String name;
+    /**
+     * 创建时间
+     */
+    private String createtime;
+    /**
+     * 更新时间
+     */
+    private String updatetime;
+    /**
+     * 删除时间
+     */
+    private String deletetime;
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/mapper/PutInStorageTypeMapper.java

@@ -0,0 +1,11 @@
+package org.dromara.InventoryManagement.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.InventoryManagement.domain.PutInStorageType;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+
+@Mapper
+public interface PutInStorageTypeMapper extends BaseMapperPlus<PutInStorageType, PutInStorageTypeVo> {
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/PutInStorageTypeService.java

@@ -0,0 +1,28 @@
+package org.dromara.InventoryManagement.service;
+
+import org.dromara.InventoryManagement.domain.bo.PutInStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.List;
+
+public interface PutInStorageTypeService {
+    TableDataInfo<PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery);
+
+    int insertPutInStorageType(PutInStorageTypeBo putInStorageTypeBo);
+
+    int updatePutInStorageType(PutInStorageTypeBo putInStorageTypeBo);
+
+    int deletePutInStorageTypeByIds(List<Integer> ids);
+
+    TableDataInfo<PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery);
+
+    int backPutInStorageTypeByIds(List<Integer> ids);
+
+    int backPutInStorageTypeAll();
+
+    int deleteRecyclePutInStorageTypeByIds(List<Integer> ids);
+
+    int deleteRecyclePutInStorageTypeAll();
+}

ruoyi-modules/ruoyi-InventoryManagement/src/main/java/org/dromara/InventoryManagement/service/impl/PutInStorageTypeServiceImpl.java

@@ -0,0 +1,90 @@
+package org.dromara.InventoryManagement.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.InventoryManagement.domain.PutInStorageType;
+import org.dromara.InventoryManagement.domain.bo.PutInStorageTypeBo;
+import org.dromara.InventoryManagement.domain.vo.PutInStorageTypeVo;
+import org.dromara.InventoryManagement.mapper.PutInStorageTypeMapper;
+import org.dromara.InventoryManagement.service.PutInStorageTypeService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Service
+@RequiredArgsConstructor
+public class PutInStorageTypeServiceImpl implements PutInStorageTypeService {
+    private final PutInStorageTypeMapper putInStorageTypeMapper;
+    @Override
+    public TableDataInfo <PutInStorageTypeVo> selectPutInStorageTypePageList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
+        QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
+        qw.like(putInStorageTypeBo.getID() != 0,"id",putInStorageTypeBo.getID());
+        qw.like(StringUtils.isNotBlank(putInStorageTypeBo.getName()),"name",putInStorageTypeBo.getName());
+        Page<PutInStorageTypeVo>page= putInStorageTypeMapper.selectVoPage(pageQuery.build(),qw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int insertPutInStorageType(PutInStorageTypeBo putInStorageTypeBo) {
+        PutInStorageType putInStorageType = MapstructUtils.convert(putInStorageTypeBo, PutInStorageType.class);
+        return putInStorageTypeMapper.insert(putInStorageType);
+    }
+    @Override
+    public int updatePutInStorageType(PutInStorageTypeBo putInStorageTypeBo) {
+        PutInStorageType putInStorageType = MapstructUtils.convert(putInStorageTypeBo, PutInStorageType.class);
+        return putInStorageTypeMapper.updateById(putInStorageType);
+    }
+    @Override
+    public int deletePutInStorageTypeByIds(List<Integer> putInStorageTypeIds){
+        UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.in("id", putInStorageTypeIds);
+        updateWrapper.set("deletetime",new Date());
+        return putInStorageTypeMapper.update(updateWrapper);
+    }
+    @Override
+    public TableDataInfo <PutInStorageTypeVo> selectRecyclePutInStorageTypeList(PutInStorageTypeBo putInStorageTypeBo, PageQuery pageQuery) {
+        QueryWrapper<PutInStorageType> qw = new QueryWrapper<>();
+        Map<String, Object> params=putInStorageTypeBo.getParams();
+        qw.eq(0 !=putInStorageTypeBo.getID(),"id",putInStorageTypeBo.getID());
+        qw.like(StringUtils.isNotBlank(putInStorageTypeBo.getName()),"name",putInStorageTypeBo.getName());
+        qw.between(params.get("begindeletetime") != null && params.get("enddeletetime") != null,
+                "deletetime", params.get("begindeletetime"), params.get("enddeletetime"));
+        qw.isNotNull("deletetime");
+        Page<PutInStorageTypeVo> page = putInStorageTypeMapper.selectVoPage(pageQuery.build(), qw);
+        return TableDataInfo.build(page);
+    }
+    @Override
+    public int backPutInStorageTypeByIds(List<Integer> putInStorageTypeIds) {
+        UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.in("id", putInStorageTypeIds);
+        updateWrapper.set("deletetime",null);
+        return putInStorageTypeMapper.update(updateWrapper);
+    }
+    @Override
+    public int backPutInStorageTypeAll() {
+        UpdateWrapper<PutInStorageType> updateWrapper=new UpdateWrapper<>();
+        updateWrapper.set("deletetime",null);
+        return putInStorageTypeMapper.update(updateWrapper);
+    }
+    @Override
+    public int deleteRecyclePutInStorageTypeByIds(List<Integer> putInStorageTypeIds) {
+        QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();
+        qw.in("id",putInStorageTypeIds);
+        qw.isNotNull("deletetime");
+        return putInStorageTypeMapper.delete(qw);
+    }
+    @Override
+    public int deleteRecyclePutInStorageTypeAll() {
+        QueryWrapper<PutInStorageType> qw=new QueryWrapper<>();
+        qw.isNotNull("deletetime");
+        return putInStorageTypeMapper.delete(qw);
+    }
+}
+

ruoyi-modules/ruoyi-InventoryManagement/src/main/resources/mapper/PutInStorageTypeMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+    PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+    "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.InventoryManagement.mapper.PutInStorageTypeMapper">
+
+</mapper>

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/OrderRecordController.java

@@ -1,7 +1,6 @@
 package org.dromara.bulk.controller;
 
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.bulk.domain.bo.OrderRecordBo;
 import org.dromara.bulk.domain.vo.OrderRecordVo;
@@ -25,7 +24,6 @@ public class OrderRecordController {
      * @param page
      * @return
      */
-    @SaIgnore
     @GetMapping("PageList")
     public TableDataInfo<OrderRecordVo> selectPageOrderRecordList(OrderRecordBo orderRecordBo, PageQuery page) {
         return orderRecordService.selectPageOrderList(orderRecordBo,page);

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/controller/ShaoHuaController.java

@@ -1,6 +1,5 @@
 package org.dromara.commodityManagement.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.commodityManagement.domain.bo.ShaoHuaBo;
 import org.dromara.commodityManagement.service.ShaoHuaService;
@@ -26,7 +25,6 @@ public class ShaoHuaController extends BaseController {
      * @param shaoHua 烧花BO对象
      * @return 烧花单价
      */
-    @SaIgnore
     @PutMapping()
     public R<Void> updateShaoHua(@RequestBody ShaoHuaBo shaoHua) {
         return toAjax(shaoHuaService.updateShaoHua(shaoHua));

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

@@ -1,6 +1,5 @@
 package org.dromara.productionManagement.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -16,7 +15,6 @@ import java.util.List;
 /**
  * 工厂管理接口
  */
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/productionManagement/factory")

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

@@ -1,23 +1,20 @@
 package org.dromara.productionManagement.controller;
 
-import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 import org.dromara.productionManagement.service.ProductionPlanService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
  * 生产计划管理接口
  */
-@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/productionManagement/productionPlan")
@@ -25,9 +22,81 @@ public class ProductionPlanController extends BaseController {
 
     private final ProductionPlanService productionPlanService;
 
+    /**
+     * 分页查询生产计划
+     * @param params 请求参数
+     * @return 分页结果
+     */
     @GetMapping("/PageList")
     public TableDataInfo<ProductionPlanVo> selectPageProductionPlan(@RequestBody Map<String,Object> params){
         PageQuery pageQuery = new PageQuery((Integer) params.get("pageSize"), (Integer) params.get("pageNum"));
         return productionPlanService.selectVoPage(params, pageQuery);
     }
+
+    /**
+     * 更新数码印花厂id
+     * @param id 订单id
+     * @param outFactory 数码印花厂id
+     * @return 结果
+     */
+    @PutMapping("/outFactory")
+    public R<Void> updateOutFactory(@RequestParam Long id, @RequestParam int outFactory){
+        return toAjax(productionPlanService.updateOutFactory(id, outFactory));
+    }
+
+    /**
+     * 更新烧花厂id
+     * @param id 订单id
+     * @param SHFactory 烧花厂id
+     * @return 结果
+     */
+    @PutMapping("/SHFactory")
+    public R<Void> updateSHFactory(@RequestParam Long id, @RequestParam int SHFactory){
+        return toAjax(productionPlanService.updateSHFactory(id, SHFactory));
+    }
+
+    /**
+     * 更新订单状态
+     * @param id 订单id
+     * @param craftStatus 订单状态码
+     * @return 结果
+     */
+    @PutMapping("/craftStatus")
+    public R<Void> updateCraftStatus(@RequestParam Long id, @RequestParam int craftStatus){
+        return toAjax(productionPlanService.updateCraftStatus(id, craftStatus));
+    }
+
+    /**
+     * 更新打印状态
+     * @param id 订单id
+     * @param printStatus 打印状态码
+     * @return 结果
+     */
+    @PutMapping("/printStatus")
+    public R<Void> updatePrintStatus(@RequestParam Long id, @RequestParam int printStatus){
+        return toAjax(productionPlanService.updatePrintStatus(id, printStatus));
+    }
+
+    /**
+     * 更新发货时间
+     * @param id 订单id
+     * @param deliveryTime 发货时间
+     * @return 结果
+     */
+    @PutMapping("/deliveryTime")
+    public R<Void> updateDeliveryTime(@RequestParam Long id, @RequestParam Date deliveryTime){
+        return toAjax(productionPlanService.updateDeliveryTime(id, deliveryTime));
+    }
+
+    /**
+     * 更新确认收货时间
+     * @param id 订单id
+     * @param confirmDeliveryTime 确认收货时间
+     * @return 结果
+     */
+    @PutMapping("/confirmDeliveryTime")
+    public R<Void> updateConfirmDeliveryTime(@RequestParam Long id, @RequestParam Date confirmDeliveryTime){
+        return toAjax(productionPlanService.updateConfirmDeliveryTime(id, confirmDeliveryTime));
+    }
+
 }

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

@@ -4,6 +4,7 @@ import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.productionManagement.domain.vo.ProductionPlanVo;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -11,5 +12,59 @@ import java.util.Map;
  */
 public interface ProductionPlanService {
 
+    /**
+     * 分页查询生产计划
+     * @param params 查询条件
+     * @param pageQuery 分页条件
+     * @return 分页结果
+     */
     TableDataInfo<ProductionPlanVo> selectVoPage(Map<String,Object> params, PageQuery pageQuery);
+
+    /**
+     * 更新数码印花厂id
+     * @param id 订单id
+     * @param outFactory 数码印花厂id
+     * @return 结果
+     */
+    int updateOutFactory(Long id, int outFactory);
+
+    /**
+     * 更新烧花厂id
+     * @param id 订单id
+     * @param SHFactory 烧花厂id
+     * @return 结果
+     */
+    int updateSHFactory(Long id, int SHFactory);
+
+    /**
+     * 更新订单状态
+     * @param id 订单id
+     * @param craftStatus 订单状态码
+     * @return 结果
+     */
+    int updateCraftStatus(Long id, int craftStatus);
+
+    /**
+     * 更新打印状态
+     * @param id 订单id
+     * @param printStatus 打印状态码
+     * @return 结果
+     */
+    int updatePrintStatus(Long id, int printStatus);
+
+    /**
+     * 更新发货时间
+     * @param id 订单id
+     * @param deliveryTime 发货时间
+     * @return 结果
+     */
+    int updateDeliveryTime(Long id, Date deliveryTime);
+
+    /**
+     * 更新确认收货时间
+     * @param id 订单id
+     * @param confirmDeliveryTime 确认收货时间
+     * @return 结果
+     */
+    int updateConfirmDeliveryTime(Long id, Date confirmDeliveryTime);
 }

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

@@ -1,6 +1,7 @@
 package org.dromara.productionManagement.service.impl;
 
 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.common.core.utils.StringUtils;
@@ -12,6 +13,7 @@ import org.dromara.productionManagement.mapper.ProductionPlanMapper;
 import org.dromara.productionManagement.service.ProductionPlanService;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.Map;
 
 /**
@@ -23,6 +25,12 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
 
     private final ProductionPlanMapper productionPlanMapper;
 
+    /**
+     * 分页查询生产计划
+     * @param params 查询条件
+     * @param pageQuery 分页条件
+     * @return 分页结果
+     */
     @Override
     public TableDataInfo<ProductionPlanVo> selectVoPage(Map<String,Object> params, PageQuery pageQuery) {
         QueryWrapper<ProductionPlan> qw = new QueryWrapper<>();
@@ -43,7 +51,8 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
         qw.eq(null != params.get("isBuHuo"), "p.is_buhuo", params.get("isBuHuo"));
         qw.eq(null != params.get("isUrgent"), "p.is_urgent", params.get("isUrgent"));
         qw.eq(StringUtils.isNotBlank((CharSequence) params.get("isSys")), "p.is_sys", params.get("isSys"));
-        qw.eq(null != params.get("craftAttrBo"), "gi.goods_type_extend_3_attr", params.get("craftAttrBo"));//构建完整的工艺扩展信息对象的JSON数据
+        //需构建完整的工艺扩展信息对象的JSON数据
+        qw.eq(null != params.get("craftAttrBo"), "gi.goods_type_extend_3_attr", params.get("craftAttrBo"));
         qw.eq(StringUtils.isNotBlank((CharSequence) params.get("brandGroup")),"gi.brand_group", params.get("brandGroup"));
         qw.eq(null != params.get("outFactoryId"),"p.out_factory_id", params.get("outFactoryId"));
         qw.eq(null != params.get("shFactoryId"),"p.sh_factory_id", params.get("shFactoryId"));
@@ -51,4 +60,82 @@ public class ProductionPlanServiceImpl implements ProductionPlanService {
         Page<ProductionPlanVo> page = productionPlanMapper.selectProductionPlanVo(pageQuery.build(), qw);
         return TableDataInfo.build(page);
     }
+
+    /**
+     * 更新数码印花厂id
+     * @param id 订单id
+     * @param outFactory 数码印花厂id
+     * @return 结果
+     */
+    @Override
+    public int updateOutFactory(Long id, int outFactory) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("out_factory_id", outFactory);
+        return productionPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新烧花厂id
+     * @param id 订单id
+     * @param SHFactory 烧花厂id
+     * @return 结果
+     */
+    @Override
+    public int updateSHFactory(Long id, int SHFactory) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("sh_factory_id", SHFactory);
+        return productionPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新订单状态
+     * @param id 订单id
+     * @param craftStatus 状态码
+     * @return 结果
+     */
+    @Override
+    public int updateCraftStatus(Long id, int craftStatus) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("craft_status", craftStatus);
+        return productionPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新打印状态
+     * @param id 订单id
+     * @param printStatus 打印状态码
+     * @return 结果
+     */
+    @Override
+    public int updatePrintStatus(Long id, int printStatus) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("print_status", printStatus);
+        return productionPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新发货时间
+     * @param id 订单id
+     * @param deliveryTime 发货时间
+     * @return 结果
+     */
+    @Override
+    public int updateDeliveryTime(Long id, Date deliveryTime) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("shipping_time", deliveryTime);
+        return productionPlanMapper.update(uw);
+    }
+
+    /**
+     * 更新确认收货时间
+     * @param id 订单id
+     * @param confirmDeliveryTime 确认收货时间
+     * @return 结果
+     */
+    @Override
+    public int updateConfirmDeliveryTime(Long id, Date confirmDeliveryTime) {
+        UpdateWrapper<ProductionPlan> uw = new UpdateWrapper<>();
+        uw.eq("id", id).set("confirm_delivery_time", confirmDeliveryTime);
+        return productionPlanMapper.update(uw);
+    }
 }