订单新增字段

sd-business/src/main/java/com/sd/business/entity/apply/dto/ApplyBuySelectDto.java

@@ -20,7 +20,7 @@ public class ApplyBuySelectDto extends BaseSelectDto {
     private String code;
 
     /**
-     * 流程状态 0未发起 1进行中 2已通过 3已驳回
+     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已作废
      */
     private Integer flowStatus;
 

sd-business/src/main/java/com/sd/business/entity/lend/dto/LendSelectDto.java

@@ -20,7 +20,7 @@ public class LendSelectDto extends BaseSelectDto {
     private String code;
 
     /**
-     * 流程状态 0未发起 1进行中 2已通过 3已驳回
+     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已作废
      */
     private Integer flowStatus;
 

sd-business/src/main/java/com/sd/business/entity/lend/po/Lend.java

@@ -56,7 +56,7 @@ public class Lend extends BasePo {
     private Long flowId;
 
     /**
-     * 流程状态 0未发起 1进行中 2已通过 3已驳回
+     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已作废
      */
     private Integer flowStatus;
 

sd-business/src/main/java/com/sd/business/entity/order/dto/OrderSkuDto.java

@@ -1,5 +1,6 @@
 package com.sd.business.entity.order.dto;
 
+import com.fjhx.file.entity.ObsFile;
 import com.sd.business.entity.order.po.OrderSku;
 import com.sd.business.entity.order.po.OrderSkuBom;
 import lombok.Getter;
@@ -24,6 +25,11 @@ public class OrderSkuDto extends OrderSku {
     private String orderCode;
 
     /**
+     * 不干胶文件
+     */
+    private ObsFile selfAdhesiveStickerFile;
+
+    /**
      * 订单包材
      */
     @Valid

sd-business/src/main/java/com/sd/business/entity/order/po/OrderInfo.java

@@ -29,6 +29,12 @@ public class OrderInfo extends BasePo {
     private Integer source;
 
     /**
+     * 订单类型 1自主订单 2委外订单
+     */
+    @NotNull(message = "订单类型不能为空")
+    private Integer type;
+
+    /**
      * 事业部id
      */
     @NotNull(message = "事业部id不能为空")
@@ -258,6 +264,16 @@ public class OrderInfo extends BasePo {
     private Long outDepartmentId;
 
     /**
+     * 流程id
+     */
+    private Long flowId;
+
+    /**
+     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已作废
+     */
+    private Integer flowStatus;
+
+    /**
      * 备注
      */
     private String remark;

sd-business/src/main/java/com/sd/business/entity/purchase/dto/PurchaseSelectDto.java

@@ -20,7 +20,7 @@ public class PurchaseSelectDto extends BaseSelectDto {
     private String code;
 
     /**
-     * 流程状态 0未发起 1进行中 2已通过 3已驳回
+     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已作废
      */
     private Integer flowStatus;
 

sd-business/src/main/java/com/sd/business/entity/purchase/po/Purchase.java

@@ -172,7 +172,7 @@ public class Purchase extends BasePo {
     private Long flowId;
 
     /**
-     * 流程状态 0未发起 1进行中 2已通过 3已驳回
+     * 流程状态 0未发起 1进行中 2已通过 3已驳回 4已作废
      */
     private Integer flowStatus;
 

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -219,6 +219,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         List<OrderSku> tempOrderSkuList = orderSkuList.stream()
                 .peek(item -> item.setOrderId(orderDto.getId()))
                 .peek(item -> item.setStockPreparationStatus(StatusConstant.NO))
+                .peek(item -> ObsFileUtil.saveFile(
+                        Collections.singletonList(item.getSelfAdhesiveStickerFile()), orderDto.getId()))
                 .map(item -> (OrderSku) item)
                 .collect(Collectors.toList());
         orderSkuService.saveBatch(tempOrderSkuList);
@@ -248,6 +250,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         List<OrderSku> tempOrderSkuList = orderSkuList.stream()
                 .peek(item -> item.setOrderId(orderDto.getId()))
                 .peek(item -> item.setStockPreparationStatus(StatusConstant.NO))
+                .peek(item -> ObsFileUtil.saveFile(
+                        Collections.singletonList(item.getSelfAdhesiveStickerFile()), orderDto.getId()))
                 .map(item -> (OrderSku) item)
                 .collect(Collectors.toList());
         orderSkuService.editLinked(tempOrderSkuList, OrderSku::getOrderId, orderDto.getId());

sd-wln/src/main/java/com/sd/wln/service/impl/WlnStatementOfAccountImpl.java

@@ -89,7 +89,7 @@ public class WlnStatementOfAccountImpl implements WlnStatementOfAccount {
 
                 statementOfAccount = new StatementOfAccount();
                 statementOfAccount.setId(IdWorker.getId());
-                statementOfAccount.setCode("SOA-" + outDate + "-" + (codeNumber + 1));
+                statementOfAccount.setCode("SOA-" + outDate + "-" + String.format("%06d", codeNumber + 1));
                 statementOfAccount.setDepartmentId(order.getDepartmentId());
                 statementOfAccount.setTimePeriod(timePeriod);
                 statementOfAccount.setType(2);