修改数据字段

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java

@@ -1,8 +1,7 @@
 package com.cf.imes.module.executor.controller.admin.order;
 
-import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO;
-import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderRespVO;
-import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderSaveReqVO;
+import com.cf.imes.module.executor.controller.admin.order.vo.order.*;
+import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
@@ -40,6 +39,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
 import java.io.IOException;
 
 
@@ -147,4 +148,16 @@ public class OrderController {
         }
     }
 
+    @PostMapping("/import")
+    @Operation(summary = "导入生产单")
+    @Parameters({
+            @Parameter(name = "file", description = "Excel 文件", required = true),
+            @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true")
+    })
+    @PreAuthorize("@ss.hasPermission('system:user:import')")
+    public CommonResult<OrderImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+                                                       @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws Exception {
+        List<OrderImportExcelVO> list = ExcelUtils.read(file, OrderImportExcelVO.class);
+        return success(orderService.importOrderList(list, updateSupport));
+    }
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderImportExcelVO.java

@@ -0,0 +1,14 @@
+package com.cf.imes.module.executor.controller.admin.order.vo.order;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * @projectName: cf_imes_server
+ * @author: 晨丰科技
+ * @date: 2024/3/6 10:01
+ */
+@Schema(description = "管理后台 - 生产单表 order_{N}新增/修改 Request VO")
+@Data
+public class OrderImportExcelVO {
+}

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderImportRespVO.java

@@ -0,0 +1,27 @@
+package com.cf.imes.module.executor.controller.admin.order.vo.order;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @projectName: cf_imes_server
+ * @author: 晨丰科技
+ * @date: 2024/3/6 10:03
+ */
+@Schema(description = "管理后台 - 生产单导入 Response VO")
+@Data
+@Builder
+public class OrderImportRespVO {
+    @Schema(description = "创建成功的生产单名数组", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<String> createUsernames;
+
+    @Schema(description = "更新成功的生产单名数组", requiredMode = Schema.RequiredMode.REQUIRED)
+    private List<String> updateUsernames;
+
+    @Schema(description = "导入失败的生产单集合，key 为生产单名，value 为失败原因", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Map<String, String> failureUsernames;
+}

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPageReqVO.java

@@ -1,6 +1,8 @@
 package com.cf.imes.module.executor.controller.admin.order.vo.order;
 
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import io.swagger.v3.oas.annotations.media.Schema;
 import com.cf.imes.framework.common.pojo.PageParam;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderRespVO.java

@@ -2,6 +2,8 @@ package com.cf.imes.module.executor.controller.admin.order.vo.order;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 import org.springframework.format.annotation.DateTimeFormat;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderSaveReqVO.java

@@ -2,6 +2,8 @@ package com.cf.imes.module.executor.controller.admin.order.vo.order;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.math.BigDecimal;
 import java.util.*;
 import javax.validation.constraints.*;
 import org.springframework.format.annotation.DateTimeFormat;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/PlatePageReqVO.java

@@ -25,7 +25,7 @@ public class PlatePageReqVO extends PageParam {
     private Integer type;
 
     @Schema(description = "商品 ID", example = "28756")
-    private Long goodsId;
+    private String goodsId;
 
     @Schema(description = "宽度")
     private Double width;

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java

@@ -14,7 +14,7 @@ import com.cf.imes.framework.mybatis.core.dataobject.BaseDO;
  *
  * @author 晨丰科技
  */
-@TableName("order")
+@TableName("`order`")
 @KeySequence("order_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java

@@ -46,6 +46,10 @@ public class PlateDO extends BaseDO {
      * 板名称
      */
     private String name;
+    /**
+     * 自定义板编号,设计有板编号，则保留设计板编号；设计没有且在机台设置中设置了自定义板编号规则，则按规则自动生成
+     */
+    private String plateNo;
     /**
      * 板类型，0 层板 1 立板 2 背板
      */
@@ -53,7 +57,7 @@ public class PlateDO extends BaseDO {
     /**
      * 商品 ID
      */
-    private Long goodsId;
+    private String goodsId;
     /**
      * 宽度
      */

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.mybatis.core.mapper.BaseMapperX;
 import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.cf.imes.module.executor.controller.admin.plan.vo.OrderPageReqVO;
+import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO;
 import com.cf.imes.module.executor.controller.admin.plan.vo.OrderRespVO;
 import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,7 +22,7 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface OrderMapper extends BaseMapperX<OrderDO> {
 
-    default PageResult<OrderDO> selectPage(com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO reqVO) {
+    default PageResult<OrderDO> selectPage(OrderPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<OrderDO>()
                 .eqIfPresent(OrderDO::getParentNo, reqVO.getParentNo())
                 .betweenIfPresent(OrderDO::getDeliveryDate, reqVO.getDeliveryDate())
@@ -43,5 +43,6 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
                 .orderByDesc(OrderDO::getId));
     }
 
+
     IPage<OrderRespVO> selectOrderPage(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper);
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderService.java

@@ -2,11 +2,15 @@ package com.cf.imes.module.executor.service.order;
 
 import javax.validation.*;
 
+import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderImportExcelVO;
+import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderImportRespVO;
 import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO;
 import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderSaveReqVO;
 import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
 import com.cf.imes.framework.common.pojo.PageResult;
 
+import java.util.List;
+
 /**
  * 生产单表 order_{N} Service 接口
  *
@@ -52,4 +56,12 @@ public interface OrderService {
      */
     PageResult<OrderDO> getOrderPage(OrderPageReqVO pageReqVO);
 
+    /**
+     * 批量导入用户
+     *
+     * @param importOrders     导入用户列表
+     * @param isUpdateSupport 是否支持更新
+     * @return 导入结果
+     */
+    OrderImportRespVO importOrderList(List<OrderImportExcelVO> importOrders, Boolean isUpdateSupport);
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -2,6 +2,8 @@ package com.cf.imes.module.executor.service.order;
 
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.excel.core.util.ExcelUtils;
+import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderImportExcelVO;
+import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderImportRespVO;
 import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO;
 import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderSaveReqVO;
 import com.cf.imes.module.system.enums.common.SexEnum;
@@ -86,4 +88,9 @@ public class OrderServiceImpl implements OrderService {
         return orderMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public OrderImportRespVO importOrderList(List<OrderImportExcelVO> importOrders, Boolean isUpdateSupport) {
+        return null;
+    }
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/IdGenerator.java

@@ -4,6 +4,7 @@ package com.cf.imes.module.executor.util;
  * @projectName: cf_imes_back
  * @author: 晨丰科技
  * @date: 2024/3/5 10:55
+ * 生产单id创建
  */
 public class IdGenerator {
     private static final long START_TIMESTAMP = 1613203200000L; // 设置起始时间戳为2021-02-13 00:00:00