问题处理

hx-mes/src/main/java/com/fjhx/mes/controller/production/ProductionSchedulingController.java

@@ -2,6 +2,7 @@ package com.fjhx.mes.controller.production;
 
 import com.fjhx.mes.entity.production.dto.ProductionSchedulingDto;
 import com.fjhx.mes.entity.production.dto.ProductionSchedulingSelectDto;
+import com.fjhx.mes.entity.production.po.ProductionScheduling;
 import com.fjhx.mes.entity.production.vo.ProductionSchedulingVo;
 import com.fjhx.mes.service.production.ProductionSchedulingService;
 import com.ruoyi.common.core.domain.BaseSelectDto;
@@ -41,8 +42,8 @@ public class ProductionSchedulingController {
      * 生产排程新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody ProductionSchedulingDto productionSchedulingDto) {
-        productionSchedulingService.add(productionSchedulingDto);
+    public void add(@RequestBody List<ProductionScheduling> dtoList) {
+        productionSchedulingService.add(dtoList);
     }
 
     /**

hx-mes/src/main/java/com/fjhx/mes/service/production/ProductionSchedulingService.java

@@ -24,7 +24,7 @@ public interface ProductionSchedulingService extends BaseService<ProductionSched
     /**
      * 生产排程新增
      */
-    void add(ProductionSchedulingDto productionSchedulingDto);
+    void add(List<ProductionScheduling> dtoList);
 
     /**
      * 生产排程编辑

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProduceOrderDetailServiceImpl.java

@@ -145,7 +145,10 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
                 .stream().collect(Collectors.groupingBy(ProductionTaskProgress::getTaskId));
 
         //对进度列表赋值排程信息
-        List<ProductionScheduling> pShList = productionSchedulingService.list(q -> q.in(ProductionScheduling::getTaskId, tIds));
+        List<ProductionScheduling> pShList = productionSchedulingService.list(q -> q
+                .in(ProductionScheduling::getTaskId, tIds)
+                .orderByAsc(ProductionScheduling::getSchedulingDate)
+        );
         for (ProductionTaskProgressVo productionTaskProgressVo : productionTaskProgressList) {
             List<ProductionScheduling> schedulingList = pShList.stream()
                     .filter(item ->
@@ -156,7 +159,6 @@ public class ProduceOrderDetailServiceImpl extends ServiceImpl<ProduceOrderDetai
 
             //排程数量求和
             int schedulingCount = schedulingList.stream().map(ProductionScheduling::getQuantity).mapToInt(Integer::intValue).sum();
-            ;
             productionTaskProgressVo.setSchedulingCount(schedulingCount);
         }
 

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionSchedulingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fjhx.mes.service.production.impl;
 
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.mes.entity.production.dto.ProductionSchedulingDto;
 import com.fjhx.mes.entity.production.dto.ProductionSchedulingSelectDto;
@@ -48,10 +49,13 @@ public class ProductionSchedulingServiceImpl extends ServiceImpl<ProductionSched
         return list.stream().collect(Collectors.groupingBy(ProductionSchedulingVo::getSchedulingDateStr));
     }
 
+    @DSTransactional
     @Override
-    public void add(ProductionSchedulingDto productionSchedulingDto) {
-        productionSchedulingDto.setCompanyId(SecurityUtils.getCompanyId());
-        this.save(productionSchedulingDto);
+    public void add(List<ProductionScheduling> dtoList) {
+        for (ProductionScheduling productionSchedulingDto : dtoList) {
+            productionSchedulingDto.setCompanyId(SecurityUtils.getCompanyId());
+        }
+        this.saveBatch(dtoList);
     }
 
     @Override

hx-sale/src/main/java/com/fjhx/sale/entity/arrival/vo/ArrivalDetailVo.java

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * purchase_到货明细单列表查询返回值实体
@@ -24,4 +25,6 @@ public class ArrivalDetailVo extends ArrivalDetail {
     private BigDecimal productHeight;
     private String productColor;
 
+    private Date arrivalTime;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/purchase/impl/EhsdPurchaseServiceImpl.java

@@ -320,6 +320,7 @@ public class EhsdPurchaseServiceImpl extends ServiceImpl<EhsdPurchaseMapper, Ehs
             item.setProductLength(product.getLength());
             item.setProductWidth(product.getWidth());
             item.setProductHeight(product.getHeight());
+            item.setProductColor(product.getColor());
         });
         result.setPurchaseProductList(ehsdPurchaseProductVos);
         //赋值出货明细

hx-sale/src/main/resources/mapper/arrival/ArrivalDetailMapper.xml

@@ -3,6 +3,7 @@
 <mapper namespace="com.fjhx.sale.mapper.arrival.ArrivalDetailMapper">
     <select id="getList" resultType="com.fjhx.sale.entity.arrival.vo.ArrivalDetailVo">
         SELECT ad.*,
+               a.arrival_time AS arrivalTime,
                a.`code`       AS arrivalCode,
                pi.`name`      AS productName,
                pi.custom_code AS productCode,

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockVo.java

@@ -133,4 +133,6 @@ public class StockVo extends Stock {
      */
     private BigDecimal stockThreshold;
 
+    private String productColor;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockServiceImpl.java

@@ -112,6 +112,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
             item.setProductLength(productInfo.getLength());
             item.setProductWidth(productInfo.getWidth());
             item.setProductHeight(productInfo.getHeight());
+            item.setProductColor(productInfo.getColor());
         });
         //赋值产品分类
         productClassifyService.attributeAssign(stockVos, StockVo::getProductClassifyId, (item, productClassify) -> {