Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

# Conflicts:
#	abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetBoxCodeRes.java
#	abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FlowQueryServiceImpl.java

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/GetBoxCodeRes.java

@@ -13,7 +13,6 @@ import java.util.List;
 /**
  * 箱码查询出参
  * TODO 测试使用，待流向查询接口完成后，根据实际情况调整结构
- *
  * @author WeiganCai
  * @date: 2021-08-02
  */
@@ -39,6 +38,9 @@ public class GetBoxCodeRes implements Serializable {
     @Data
     @Accessors(chain = true)
     public static class SkuBean implements Serializable {
+        @Schema(name = "品牌编码")
+        private Long brandCode;
+
         @Schema(name = "品牌名称")
         private String brandName;
 
@@ -81,8 +83,8 @@ public class GetBoxCodeRes implements Serializable {
         @Schema(name = "节点状态")
         private Integer nodeStatus;
 
-        @Schema(name = "异常形式 0-无异常 1-流出异常 2-流入异常")
-        private Integer abnormalForm = 0;
+        @Schema(name = "异常类型 1-流入异常 2-流出异常")
+        private Integer abnormalType;
 
         @Schema(name = "是否拆垛")
         private Integer isSplit;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/FlowQueryServiceImpl.java

@@ -29,6 +29,7 @@ public class FlowQueryServiceImpl implements FlowQueryService {
         GetBoxCodeRes res = new GetBoxCodeRes();
 
         GetBoxCodeRes.SkuBean sku = new GetBoxCodeRes.SkuBean()
+                .setBrandCode(320258L)
                 .setBrandName("百威")
                 .setSkuId(30859L)
                 .setSkuName("百威9.7度500ML1X18纸箱听装-温州版")
@@ -67,7 +68,7 @@ public class FlowQueryServiceImpl implements FlowQueryService {
         flow = new GetBoxCodeRes.FlowBean()
                 .setNodeName("二级经销商")
                 .setNodeStatus(0)
-                .setAbnormalForm(1)
+                .setAbnormalType(2)
                 .setIsSplit(1)
                 .setSplitStackCode("200712348457ADB2")
                 .setInStorageTime(LocalDateTime.of(2020, 12, 26, 11, 12, 38))
@@ -77,7 +78,7 @@ public class FlowQueryServiceImpl implements FlowQueryService {
         flow = new GetBoxCodeRes.FlowBean()
                 .setNodeName("杭州市延海百利超市（新华小区店）")
                 .setNodeStatus(0)
-                .setAbnormalForm(2)
+                .setAbnormalType(1)
                 .setIsSplit(0)
                 .setInStorageTime(LocalDateTime.of(2020, 12, 27, 11, 12, 38));
         flowList.add(flow);