From 7e52fc7563b18de5a3bafd87f71c43741947770d Mon Sep 17 00:00:00 2001
From: 杨凯 <398860375@qq.com>
Date: 星期五, 20 十月 2023 13:14:53 +0800
Subject: [PATCH] 新增部门出入库
---
consum-base/doc/项目资料/河南邮政低值易耗品V20231011.pdm | 40 +++---
consum-base/src/main/java/com/consum/base/core/param/CheckOutWhParam.java | 16 ++
consum-base/src/main/java/com/consum/base/core/param/CheckWhEntity.java | 33 +++++
consum-base/doc/项目资料/河南邮政低值易耗品V20231011.pdb | 40 +++---
consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java | 156 ++++++++++++++++++++++++++
consum-base/src/main/java/com/consum/base/core/param/CheckInWhParam.java | 24 ++++
6 files changed, 269 insertions(+), 40 deletions(-)
diff --git "a/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231011.pdb" "b/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231011.pdb"
index d5d45a8..712c6b2 100644
--- "a/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231011.pdb"
+++ "b/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231011.pdb"
@@ -5341,9 +5341,9 @@
</o:ReferenceSymbol>
<o:ReferenceSymbol Id="o152">
<a:CreationDate>1696994604</a:CreationDate>
-<a:ModificationDate>1697594459</a:ModificationDate>
-<a:Rect>((-33886,61877), (-28104,63127))</a:Rect>
-<a:ListOfPoints>((-28504,62502),(-33486,62502))</a:ListOfPoints>
+<a:ModificationDate>1697702367</a:ModificationDate>
+<a:Rect>((-33886,66613), (-27651,67863))</a:Rect>
+<a:ListOfPoints>((-28051,67238),(-33486,67238))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5407,9 +5407,9 @@
</o:ReferenceSymbol>
<o:ReferenceSymbol Id="o164">
<a:CreationDate>1696999030</a:CreationDate>
-<a:ModificationDate>1696999278</a:ModificationDate>
-<a:Rect>((-33886,51175), (-17981,54022))</a:Rect>
-<a:ListOfPoints>((-18381,51575),(-18381,53397),(-33486,53397))</a:ListOfPoints>
+<a:ModificationDate>1697702369</a:ModificationDate>
+<a:Rect>((-33886,44470), (-28199,45720))</a:Rect>
+<a:ListOfPoints>((-28599,45095),(-33486,45095))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5429,9 +5429,9 @@
</o:ReferenceSymbol>
<o:ReferenceSymbol Id="o167">
<a:CreationDate>1696999039</a:CreationDate>
-<a:ModificationDate>1697594459</a:ModificationDate>
-<a:Rect>((-17806,51175), (-16556,57203))</a:Rect>
-<a:ListOfPoints>((-17181,56803),(-17181,51575))</a:ListOfPoints>
+<a:ModificationDate>1697702369</a:ModificationDate>
+<a:Rect>((-17263,50994), (-16013,60192))</a:Rect>
+<a:ListOfPoints>((-16638,59792),(-16638,51394))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5764,9 +5764,9 @@
</o:TableSymbol>
<o:TableSymbol Id="o153">
<a:CreationDate>1696836662</a:CreationDate>
-<a:ModificationDate>1697594459</a:ModificationDate>
+<a:ModificationDate>1697702367</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-28504,56803), (-4732,68201))</a:Rect>
+<a:Rect>((-28051,59792), (-4279,71190))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>12615935</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@@ -5914,9 +5914,9 @@
</o:NoteSymbol>
<o:TableSymbol Id="o165">
<a:CreationDate>1696998335</a:CreationDate>
-<a:ModificationDate>1696999278</a:ModificationDate>
+<a:ModificationDate>1697702369</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-29142,38977), (-5220,51575))</a:Rect>
+<a:Rect>((-28599,38796), (-4677,51394))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@@ -6587,11 +6587,11 @@
<o:Column Id="o241">
<a:ObjectID>7A921B7E-0F67-41A6-A408-03EF44771359</a:ObjectID>
<a:Name>鍏ュ簱鏃堕棿</a:Name>
-<a:Code>ININPUT_TIME</a:Code>
+<a:Code>INPUT_TIME</a:Code>
<a:CreationDate>1696990745</a:CreationDate>
<a:Creator>asus</a:Creator>
-<a:ModificationDate>1696990935</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
+<a:ModificationDate>1697698579</a:ModificationDate>
+<a:Modifier>Administrator</a:Modifier>
<a:Comment>閲囪喘鏃堕棿</a:Comment>
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
@@ -9041,11 +9041,11 @@
<a:Code>CLASSIFICATION</a:Code>
<a:CreationDate>1696994977</a:CreationDate>
<a:Creator>asus</a:Creator>
-<a:ModificationDate>1697268585</a:ModificationDate>
-<a:Modifier>39886</a:Modifier>
+<a:ModificationDate>1697700623</a:ModificationDate>
+<a:Modifier>Administrator</a:Modifier>
<a:Comment>绫诲埆锛�1=閲囪喘鍏ュ簱;2=闆舵槦鍏ュ簱锛�3=闆舵槦鍑哄簱锛�4=璋冩嫧鍏ュ簱锛�
-5=璋冩嫧鍑哄簱锛�6=棰嗙敤鍑哄簱锛�7=褰掕繕鍏ュ簱锛�8=鐩樼偣鍏ュ簱锛�
-9=鐩樼偣鍑哄簱锛�10=鎶ュ簾鍑哄簱锛�11=鍒嗗彂鍑哄簱锛�12=鍒嗗彂杩斿簱锛�</a:Comment>
+5=璋冩嫧鍑哄簱锛�6=鐩樼偣鍏ュ簱锛�7=鐩樼偣鍑哄簱锛�8=鎶ュ簾鍑哄簱锛�9=鍦ㄧ敤鎶ュ簾
+10=鍒嗗彂鍑哄簱锛�11=鍒嗗彂杩斿簱锛�</a:Comment>
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
diff --git "a/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231011.pdm" "b/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231011.pdm"
index d5d45a8..712c6b2 100644
--- "a/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231011.pdm"
+++ "b/consum-base/doc/\351\241\271\347\233\256\350\265\204\346\226\231/\346\262\263\345\215\227\351\202\256\346\224\277\344\275\216\345\200\274\346\230\223\350\200\227\345\223\201V20231011.pdm"
@@ -5341,9 +5341,9 @@
</o:ReferenceSymbol>
<o:ReferenceSymbol Id="o152">
<a:CreationDate>1696994604</a:CreationDate>
-<a:ModificationDate>1697594459</a:ModificationDate>
-<a:Rect>((-33886,61877), (-28104,63127))</a:Rect>
-<a:ListOfPoints>((-28504,62502),(-33486,62502))</a:ListOfPoints>
+<a:ModificationDate>1697702367</a:ModificationDate>
+<a:Rect>((-33886,66613), (-27651,67863))</a:Rect>
+<a:ListOfPoints>((-28051,67238),(-33486,67238))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5407,9 +5407,9 @@
</o:ReferenceSymbol>
<o:ReferenceSymbol Id="o164">
<a:CreationDate>1696999030</a:CreationDate>
-<a:ModificationDate>1696999278</a:ModificationDate>
-<a:Rect>((-33886,51175), (-17981,54022))</a:Rect>
-<a:ListOfPoints>((-18381,51575),(-18381,53397),(-33486,53397))</a:ListOfPoints>
+<a:ModificationDate>1697702369</a:ModificationDate>
+<a:Rect>((-33886,44470), (-28199,45720))</a:Rect>
+<a:ListOfPoints>((-28599,45095),(-33486,45095))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5429,9 +5429,9 @@
</o:ReferenceSymbol>
<o:ReferenceSymbol Id="o167">
<a:CreationDate>1696999039</a:CreationDate>
-<a:ModificationDate>1697594459</a:ModificationDate>
-<a:Rect>((-17806,51175), (-16556,57203))</a:Rect>
-<a:ListOfPoints>((-17181,56803),(-17181,51575))</a:ListOfPoints>
+<a:ModificationDate>1697702369</a:ModificationDate>
+<a:Rect>((-17263,50994), (-16013,60192))</a:Rect>
+<a:ListOfPoints>((-16638,59792),(-16638,51394))</a:ListOfPoints>
<a:CornerStyle>1</a:CornerStyle>
<a:ArrowStyle>1</a:ArrowStyle>
<a:LineColor>12615680</a:LineColor>
@@ -5764,9 +5764,9 @@
</o:TableSymbol>
<o:TableSymbol Id="o153">
<a:CreationDate>1696836662</a:CreationDate>
-<a:ModificationDate>1697594459</a:ModificationDate>
+<a:ModificationDate>1697702367</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-28504,56803), (-4732,68201))</a:Rect>
+<a:Rect>((-28051,59792), (-4279,71190))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>12615935</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@@ -5914,9 +5914,9 @@
</o:NoteSymbol>
<o:TableSymbol Id="o165">
<a:CreationDate>1696998335</a:CreationDate>
-<a:ModificationDate>1696999278</a:ModificationDate>
+<a:ModificationDate>1697702369</a:ModificationDate>
<a:IconMode>-1</a:IconMode>
-<a:Rect>((-29142,38977), (-5220,51575))</a:Rect>
+<a:Rect>((-28599,38796), (-4677,51394))</a:Rect>
<a:LineColor>12615680</a:LineColor>
<a:FillColor>16570034</a:FillColor>
<a:ShadowColor>12632256</a:ShadowColor>
@@ -6587,11 +6587,11 @@
<o:Column Id="o241">
<a:ObjectID>7A921B7E-0F67-41A6-A408-03EF44771359</a:ObjectID>
<a:Name>鍏ュ簱鏃堕棿</a:Name>
-<a:Code>ININPUT_TIME</a:Code>
+<a:Code>INPUT_TIME</a:Code>
<a:CreationDate>1696990745</a:CreationDate>
<a:Creator>asus</a:Creator>
-<a:ModificationDate>1696990935</a:ModificationDate>
-<a:Modifier>asus</a:Modifier>
+<a:ModificationDate>1697698579</a:ModificationDate>
+<a:Modifier>Administrator</a:Modifier>
<a:Comment>閲囪喘鏃堕棿</a:Comment>
<a:DataType>bigint</a:DataType>
<a:GlobalObjectID/>
@@ -9041,11 +9041,11 @@
<a:Code>CLASSIFICATION</a:Code>
<a:CreationDate>1696994977</a:CreationDate>
<a:Creator>asus</a:Creator>
-<a:ModificationDate>1697268585</a:ModificationDate>
-<a:Modifier>39886</a:Modifier>
+<a:ModificationDate>1697700623</a:ModificationDate>
+<a:Modifier>Administrator</a:Modifier>
<a:Comment>绫诲埆锛�1=閲囪喘鍏ュ簱;2=闆舵槦鍏ュ簱锛�3=闆舵槦鍑哄簱锛�4=璋冩嫧鍏ュ簱锛�
-5=璋冩嫧鍑哄簱锛�6=棰嗙敤鍑哄簱锛�7=褰掕繕鍏ュ簱锛�8=鐩樼偣鍏ュ簱锛�
-9=鐩樼偣鍑哄簱锛�10=鎶ュ簾鍑哄簱锛�11=鍒嗗彂鍑哄簱锛�12=鍒嗗彂杩斿簱锛�</a:Comment>
+5=璋冩嫧鍑哄簱锛�6=鐩樼偣鍏ュ簱锛�7=鐩樼偣鍑哄簱锛�8=鎶ュ簾鍑哄簱锛�9=鍦ㄧ敤鎶ュ簾
+10=鍒嗗彂鍑哄簱锛�11=鍒嗗彂杩斿簱锛�</a:Comment>
<a:DataType>int</a:DataType>
<a:GlobalObjectID/>
</o:Column>
diff --git a/consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java b/consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java
new file mode 100644
index 0000000..8252dc7
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java
@@ -0,0 +1,156 @@
+package com.consum.base.core.param;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 鍑哄叆搴撳弬鏁�
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Slf4j
+public class BaseWarehouseParam1 {
+
+ /**
+ * 鏄惁鍏ュ簱 true 鏄� false 鍚︼紙鍑哄簱锛�
+ */
+ private Boolean isCheckIn;
+
+ /**
+ * 涓氬姟琛ㄥ崟ID
+ */
+ private Long business_form_id;
+ /**
+ * 涓氬姟琛ㄥ崟Code
+ */
+ private String business_form_code;
+
+ /**
+ * 涓氬姟琛ㄥ崟鍚嶇О
+ */
+ private String business_form_name;
+ /**
+ * 鎿嶄綔浜虹紪鍙�
+ */
+ private Long operator_id;
+ /**
+ * 鎿嶄綔浜哄鍚�
+ */
+ private String operator_name;
+
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
+ private Long deal_time;
+
+ /**
+ * 浠撳簱id
+ */
+ private Long warehouseId;
+
+ /**
+ * 鍑哄叆搴撳弬鏁�
+ */
+ private List<CheckWhEntity> list;
+
+ /**
+ * 鍏ュ簱绫诲瀷
+ */
+ private In_OutPutTypeEnum inOutPutTypeEnum;
+
+
+ public enum In_OutPutTypeEnum {
+
+ /**
+ * 姝ｅ父鍏ュ簱锛�0
+ */
+ Common(0),
+ /**
+ * 閲囪喘鍏ュ簱锛�1
+ */
+ Procure_Input(1),
+
+ /**
+ * 闆舵槦鍏ュ簱 2
+ */
+ Fragmentary_Input(2),
+
+ /**
+ * 闆舵槦鍑哄簱 3
+ */
+ Fragmentary_Output(3),
+
+
+ /**
+ * 璋冩嫧鍏ュ簱 4
+ */
+ Transfer_Input(4),
+ /**
+ * 璋冩嫧鍑哄簱 5
+ */
+ Transfer_Output(5),
+
+
+ /**
+ * 鐩樼偣鍏ュ簱 6
+ */
+ Inventory_Input(6),
+
+ /**
+ * 鐩樼偣鍑哄簱 7
+ */
+ Inventory_Output(7),
+
+ /**
+ * 浠撳簱鐗╁搧鎶ュ簾
+ */
+ Scrapped_Warehouse(8),
+
+ /**
+ * 鍦ㄧ敤鐗╁搧鎶ュ簾
+ */
+ Scrapped_Using(9),
+ /**
+ * 鍒嗗彂鍑哄簱
+ */
+ Lending_Out(10),
+ /**
+ * 鍒嗗彂杩斿簱
+ */
+ Lending_Back(11);
+
+
+ private int value;
+
+ In_OutPutTypeEnum(int value) {
+ this.value = value;
+ }
+
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * 鏍规嵁缂栫爜鑾峰彇瀵瑰簲鏋氫妇
+ *
+ * @param key 缂栫爜
+ * @return
+ */
+ public static In_OutPutTypeEnum getValueByKey(String key) {
+ for (In_OutPutTypeEnum myEnum : In_OutPutTypeEnum.values()) {
+ if (myEnum.name().equals(key)) {
+ return myEnum;
+ }
+ }
+ return null;
+ }
+ }
+
+
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/core/param/CheckInWhParam.java b/consum-base/src/main/java/com/consum/base/core/param/CheckInWhParam.java
new file mode 100644
index 0000000..8482186
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/param/CheckInWhParam.java
@@ -0,0 +1,24 @@
+package com.consum.base.core.param;
+
+import com.consum.model.po.WhFormProcureModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+/**
+ * 鍏ュ簱鍙傛暟
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Slf4j
+public class CheckInWhParam extends BaseWarehouseParam{
+
+ /**
+ * 閲囪喘鐗╁搧鍒楄〃锛岄噰璐叆搴撴椂浣跨敤
+ */
+ private List<WhFormProcureModel> modelList;
+}
diff --git a/consum-base/src/main/java/com/consum/base/core/param/CheckOutWhParam.java b/consum-base/src/main/java/com/consum/base/core/param/CheckOutWhParam.java
new file mode 100644
index 0000000..287d353
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/param/CheckOutWhParam.java
@@ -0,0 +1,16 @@
+package com.consum.base.core.param;
+
+import com.consum.model.po.WhFormTransferGoods;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CheckOutWhParam extends BaseWarehouseParam {
+
+ /**
+ * 璋冩嫧鍑哄簱鐗╁搧鍒楄〃
+ */
+ private List<WhFormTransferGoods> trqansferGoodsList;
+
+}
diff --git a/consum-base/src/main/java/com/consum/base/core/param/CheckWhEntity.java b/consum-base/src/main/java/com/consum/base/core/param/CheckWhEntity.java
new file mode 100644
index 0000000..ef5f7ee
--- /dev/null
+++ b/consum-base/src/main/java/com/consum/base/core/param/CheckWhEntity.java
@@ -0,0 +1,33 @@
+package com.consum.base.core.param;
+
+public class CheckWhEntity {
+
+ /**
+ * 鍑哄叆搴撴暟閲�
+ */
+ private Integer count;
+
+ /**
+ * 瑙勬牸鍨嬪彿id
+ */
+ private Long modelId;
+
+
+ public Integer getCount() {
+ return count;
+ }
+
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+
+ public Long getModelId() {
+ return modelId;
+ }
+
+ public void setModelId(Long modelId) {
+ this.modelId = modelId;
+ }
+
+
+}
--
Gitblit v1.9.1