导入修改

ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/vo/OutboundTemplateVO.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import java.util.Date;
 
@@ -28,11 +29,11 @@ public class OutboundTemplateVO extends BaseEntity {
     private Date inboundDate;
 
     /** 订单类型 */
-    @Excel(name = "订单类型")
+    @Excel(name = "订单类型",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private String orderTypeId;
 
     /** SAP号 */
-    @Excel(name = "SAP No")
+    @Excel(name = "SAP No",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private String sapNo;
 
     /** 物料ID */
@@ -65,7 +66,7 @@ public class OutboundTemplateVO extends BaseEntity {
     private Long actualPackages;
 
     /** 实发数量（实际数量） */
-    @Excel(name = "实发数量")
+    @Excel(name = "实发数量",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private Long actualQuantity;
 
     /** 库位名称 */
@@ -103,7 +104,7 @@ public class OutboundTemplateVO extends BaseEntity {
     private String dangerCheckType;
 
     /** 单号 */
-    @Excel(name = "单号")
+    @Excel(name = "单号",headerColor = IndexedColors.BLACK,headerBackgroundColor = IndexedColors.WHITE)
     private String orderId;
 
     /** 系统编号（系统单号） */

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/impl/OutboundOrdersServiceImpl.java

@@ -823,6 +823,9 @@ public class OutboundOrdersServiceImpl implements IOutboundOrdersService {
                     BeanUtils.copyProperties(vo, itemDO,
                             "orderId", "systemNo", "orderTypeId", "batchId", "warehouseName", "warehouseId");
 
+                    if(itemDO.getPlannedQuantity() == null || itemDO.getPlannedQuantity() <= 0) {
+                        itemDO.setPlannedQuantity(itemDO.getActualQuantity());
+                    }
                     // 填充明细必填字段
                     itemDO.setId(UUID.randomUUID().toString().replace("-", ""));
                     itemDO.setOrderId(orderId);