新增部门出入库

杨凯

2023-10-20 7e52fc7563b18de5a3bafd87f71c43741947770d

新增部门出入库

 consum-base/doc/ÏîÄ¿×ÊÁÏ/ºÓÄÏÓÊÕþµÍÖµÒ׺ÄÆ·V20231011.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>

 consum-base/doc/ÏîÄ¿×ÊÁÏ/ºÓÄÏÓÊÕþµÍÖµÒ׺ÄÆ·V20231011.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>

 consum-base/src/main/java/com/consum/base/core/param/BaseWarehouseParam1.java

New file
@@ -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;
        }
    }



}

 consum-base/src/main/java/com/consum/base/core/param/CheckInWhParam.java

New file
@@ -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;
}

 consum-base/src/main/java/com/consum/base/core/param/CheckOutWhParam.java

New file
@@ -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;

}

 consum-base/src/main/java/com/consum/base/core/param/CheckWhEntity.java

New file
@@ -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;
    }


}