余料库新增纹理字段

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, "商品信息获取错误");

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();

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;
 

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;

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;

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;
     /**
      * 宽度
      */

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())