zhangyuewww 4 سال پیش
والد
کامیت
366ba917b8

+ 4 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -41,6 +41,10 @@ public enum StatusEnum {
     TRAN_DO("1", "执行中", "Under implementation"),
     TRAN_COMPLETED("3", "已完成", "Completed"),
 
+    //清仓状态
+    NOT_CLEARED("1", "未清仓", "not_cleared"),
+    CLEARED("3", "已清仓", "cleared"),
+
 
 
     ;

+ 12 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -48,6 +48,18 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      * 仓库类型(1 自有库 2 临时库)
      */
     private String warehouseType;
+    /**
+     * 创建临时库方式(1 自动 2 手动)
+     */
+    private String createType;
+    /**
+     * 清仓状态标识
+     */
+    private String clearStatusFlag;
+    /**
+     * 清仓状态
+     */
+    private String clearStatus;
     /**
      * 负责人
      */

+ 8 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -102,6 +102,14 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      * 出入库类型
      */
     private String inOutType;
+    /**
+     * 临时库出库类型key
+     */
+    private String temporaryOutTypeKey;
+    /**
+     * 临时库出库类型
+     */
+    private String temporaryOutType;
     /**
      * 车牌号
      */

+ 2 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -293,6 +293,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         //新增主键id
         warehouseBaseInfo.setId(IdGenerator.generateUUID());
         warehouseBaseInfo.setWarehouseType("2");
+        warehouseBaseInfo.setClearStatusFlag(StatusEnum.NOT_CLEARED.getFlag());
+        warehouseBaseInfo.setClearStatus(StatusEnum.NOT_CLEARED.getName());
         //判断仓库名称是否唯一
         List<WarehouseBaseInfo> warehouseBaseInfos =
                 warehouseBaseInfoService.selectList(new EntityWrapper<WarehouseBaseInfo>()