From 5418cfdbdfe6e65cd9b5319896d201fb8247d652 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Tue, 2 Jul 2024 11:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E6=96=99=E5=BA=93=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=BA=B9=E7=90=86=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/enums/ErrorCodeConstants.java    |   1 +
 .../admin/order/OrderController.java          |   4 ++++
 .../resources/type/生产单新增Excel模板.xlsx   | Bin 29011 -> 29001 bytes
 .../plate/vo/remain/RemainPlatePageReqVO.java |   3 +++
 .../plate/vo/remain/RemainPlateRespVO.java    |   6 ++++++
 .../plate/vo/remain/RemainPlateSaveReqVO.java |   4 ++++
 .../remainplaten/RemainPlateDO.java           |   4 ++++
 .../mysql/remainplaten/RemainPlateMapper.java |   1 +
 8 files changed, 23 insertions(+)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java
index 1f6ca6d99..876f30230 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-api/src/main/java/com/cf/imes/module/executor/enums/ErrorCodeConstants.java
@@ -56,6 +56,7 @@ public interface ErrorCodeConstants {
     ErrorCode ORDER_STATUS_ERROR = new ErrorCode(1_002_029_006, "生产单不允许删除");
     ErrorCode APP_TOKEN_ERROR = new ErrorCode(1_002_029_007, "token获取失败");
     ErrorCode PLATE_PLAN_DATA_ERROR = new ErrorCode(1_002_029_008, "板材生产数据获取错误或此单不存在");
+    ErrorCode PLATE_PLAN_DATA_NULL = new ErrorCode(1_002_029_008, "板材生产源数据为空");
     ErrorCode PARTS_DATA_ERROR = new ErrorCode(1_002_029_009, "配件数据获取错误");
     ErrorCode BODY_DATA_ERROR = new ErrorCode(1_002_029_010, "柜体数据获取错误");
     ErrorCode GOODS_DATA_ERROR = new ErrorCode(1_002_029_011, "商品信息获取错误");
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
index ecfdbf177..24d41f17b 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
@@ -38,6 +38,7 @@ import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 
 import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*;
 import static com.cf.imes.module.executor.enums.ErrorCodeConstants.PLATE_PLAN_DATA_ERROR;
+import static com.cf.imes.module.executor.enums.ErrorCodeConstants.PLATE_PLAN_DATA_NULL;
 
 import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
 import com.cf.imes.module.executor.service.order.OrderService;
@@ -217,6 +218,9 @@ public class OrderController {
         if (!dataPlates.getString("err_code").equals("0")) {
             throw exception(PLATE_PLAN_DATA_ERROR);
         }
+        if (dataPlates.getJSONObject("value") == null) {
+            throw exception(PLATE_PLAN_DATA_NULL);
+        }
         JSONObject dataParts = apiDataAchieve.getApiPartsMessage(token, orderNo).get();
         JSONObject dataBody = apiDataAchieve.getApiBodyMessage(token, orderNo).get();
         JSONObject dataGoods = apiDataAchieve.getApiGoodsMessage(token, orderNo).get();
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/生产单新增Excel模板.xlsx b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/type/生产单新增Excel模板.xlsx
index a18f221c6a0876fc963faaa9ecd8d49b1d6a53cd..2a663c272cc3ceebe4c778f4fb3758409c47d353 100644
GIT binary patch
delta 9944
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
a1OLZs-LM^xC+L!}2cGwEh~57D^?v}3XU?er

delta 9922
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
MW<Voz`18^K0Z&L9ng9R*

diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java
index 3d9fb2019..f106d3456 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlatePageReqVO.java
@@ -49,6 +49,9 @@ public class RemainPlatePageReqVO extends PageParam {
     @Schema(description = "颜色")
     private String color;
 
+    @Schema(description = "纹理")
+    private String texture;
+
     @Schema(description = "宽度")
     private BigDecimal[] width;
 
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateRespVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateRespVO.java
index 03736b370..9da84d1cb 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateRespVO.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateRespVO.java
@@ -7,6 +7,8 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.alibaba.excel.annotation.*;
 
+import javax.validation.constraints.NotEmpty;
+
 @Schema(description = "管理后台 - 生产单余料板表 order_remain_plate_{N} Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -56,6 +58,10 @@ public class RemainPlateRespVO {
     @ExcelProperty("颜色")
     private String color;
 
+    @Schema(description = "纹理 有 无", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("纹理 有 无")
+    private String texture;
+
     @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("宽度")
     private BigDecimal width;
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateSaveReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateSaveReqVO.java
index 50377d8b4..9b0d3341d 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateSaveReqVO.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/vo/remain/RemainPlateSaveReqVO.java
@@ -47,6 +47,10 @@ public class RemainPlateSaveReqVO {
     @NotEmpty(message = "颜色不能为空")
     private String color;
 
+    @Schema(description = "纹理 有 无", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "纹理不能为空")
+    private String texture;
+
     @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "宽度不能为空")
     private BigDecimal width;
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/remainplaten/RemainPlateDO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/remainplaten/RemainPlateDO.java
index 14ce761cf..582b07522 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/remainplaten/RemainPlateDO.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/dataobject/remainplaten/RemainPlateDO.java
@@ -66,6 +66,10 @@ public class RemainPlateDO extends BaseDO {
      * 颜色
      */
     private String color;
+    /**
+     * 纹理
+     */
+    private Boolean texture;
     /**
      * 宽度
      */
diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
index 0fc128468..ea17cb243 100644
--- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
+++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/remainplaten/RemainPlateMapper.java
@@ -36,6 +36,7 @@ public interface RemainPlateMapper extends BaseMapperX<RemainPlateDO> {
                 .eqIfPresent(RemainPlateDO::getPlaceStyle, reqVO.getPlaceStyle())
                 .likeIfPresent(RemainPlateDO::getStore, reqVO.getStore())
                 .eqIfPresent(RemainPlateDO::getCount, reqVO.getCount())
+                .eqIfPresent(RemainPlateDO::getTexture, reqVO.getTexture())
                 .likeIfPresent(RemainPlateDO::getRemark, reqVO.getRemark())
                 .eqIfPresent(RemainPlateDO::getUseType, reqVO.getUseType())
                 .eqIfPresent(RemainPlateDO::getOrganId, reqVO.getOrganId())