diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandQuantityVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandQuantityVO.java
index d3ae8ccd8..f9eeb218e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandQuantityVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandQuantityVO.java
@@ -21,6 +21,8 @@ public class StoreProdDemandQuantityVO {
     private Long storeId;
     @ApiModelProperty(value = "档口商品ID")
     private Long storeProdId;
+    @ApiModelProperty(value = "档口颜色ID")
+    private Long storeColorId;
     @ApiModelProperty(value = "档口商品颜色ID")
     private Long storeProdColorId;
     @ApiModelProperty(value = "货号")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVO.java
index 8af046c7f..979942fb0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeProductDemand/StoreProdDemandVO.java
@@ -42,6 +42,9 @@ public class StoreProdDemandVO {
         @NotNull(message = "档口商品颜色ID不能为空")
         @ApiModelProperty(value = "档口商品颜色ID", required = true)
         private Long storeProdColorId;
+        @NotNull(message = "档口颜色ID不能为空")
+        @ApiModelProperty(value = "档口颜色ID")
+        private Long storeColorId;
         @NotBlank(message = "货号不能为空")
         @ApiModelProperty(value = "货号", required = true)
         private String prodArtNum;
diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java
index 107ad01f5..65d968f3c 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductDemandDetail.java
@@ -45,6 +45,11 @@ public class StoreProductDemandDetail extends XktBaseEntity {
     @Excel(name = "档口商品颜色ID")
     private Long storeProdColorId;
 
+    /**
+     * 档口颜色ID
+     */
+    private Long storeColorId;
+
     /**
      * 档口商品货号
      */
diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDTO.java
index a3f8570a2..793487c65 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -30,6 +31,8 @@ public class StoreProdDemandDTO {
         private Long storeProdId;
         @ApiModelProperty(value = "档口商品颜色ID")
         private Long storeProdColorId;
+        @ApiModelProperty(value = "档口颜色ID")
+        private Long storeColorId;
         @ApiModelProperty(value = "货号")
         private String prodArtNum;
         @ApiModelProperty(value = "颜色")
diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandPageResDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandPageResDTO.java
index 235686ec6..6c6e67e08 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandPageResDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandPageResDTO.java
@@ -1,6 +1,7 @@
 package com.ruoyi.xkt.dto.storeProductDemand;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -33,6 +34,12 @@ public class StoreProdDemandPageResDTO {
     private String prodArtNum;
     @ApiModelProperty(value = "颜色")
     private String colorName;
+    @ApiModelProperty(value = "档口商品颜色ID")
+    private Long storeProdColorId;
+    @ApiModelProperty(value = "档口颜色ID")
+    private Long storeColorId;
+    @ApiModelProperty(value = "档口商品ID")
+    private Long storeProdId;
     @ApiModelProperty(value = "生产状态")
     private Integer detailStatus;
     @ApiModelProperty(value = "紧急单还是正常单")
diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandQuantityDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandQuantityDTO.java
index bde953d4e..e17ba21d8 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandQuantityDTO.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeProductDemand/StoreProdDemandQuantityDTO.java
@@ -19,6 +19,8 @@ public class StoreProdDemandQuantityDTO {
     private Long storeId;
     @ApiModelProperty(value = "档口商品ID")
     private Long storeProdId;
+    @ApiModelProperty(value = "档口颜色ID")
+    private Long storeColorId;
     @ApiModelProperty(value = "档口商品颜色ID")
     private Long storeProdColorId;
     @ApiModelProperty(value = "货号")
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
index 71cbf95d0..d5f8ef732 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductDemandServiceImpl.java
@@ -136,7 +136,7 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService
             List<Integer> size42List = Arrays.asList(ObjectUtils.isNotEmpty(stock) && ObjectUtils.isNotEmpty(stock.getSize42()) ? stock.getSize42() : 0, size42Demand);
             List<Integer> size43List = Arrays.asList(ObjectUtils.isNotEmpty(stock) && ObjectUtils.isNotEmpty(stock.getSize43()) ? stock.getSize43() : 0, size43Demand);
             return StoreProdDemandQuantityDTO.builder().storeId(storeId).storeProdId(storeProd.getId()).storeProdColorId(prodColor.getId())
-                    .prodArtNum(storeProd.getProdArtNum()).colorName(prodColor.getColorName()).compareStrList(compareStrList)
+                    .storeColorId(prodColor.getStoreColorId()).prodArtNum(storeProd.getProdArtNum()).colorName(prodColor.getColorName()).compareStrList(compareStrList)
                     // 判断 demandDetailList 中是否有 createTime 为当天的对象
                     .todaySubmitted(demandDetailList.stream().anyMatch(detail -> DateUtils.isSameDay(detail.getCreateTime(), new Date())))
                     .size30List(size30List).size31List(size31List).size32List(size32List).size33List(size33List).size34List(size34List).size35List(size35List)
@@ -168,7 +168,7 @@ public class StoreProductDemandServiceImpl implements IStoreProductDemandService
         // 生产需求详情
         List<StoreProductDemandDetail> detailList = demandDTO.getDetailList().stream().map(x -> {
             StoreProductDemandDetail detail = BeanUtil.toBean(x, StoreProductDemandDetail.class).setStoreId(demandDTO.getStoreId())
-                    .setStoreProdDemandId(demand.getId()).setDetailStatus(1);
+                    .setStoreProdDemandId(demand.getId()).setDetailStatus(DemandStatus.PENDING_PRODUCTION.getValue());
             detail.setCreateBy(SecurityUtils.getUsername());
             return detail;
         }).collect(Collectors.toList());