#

wang..123

2022-02-21 d385e17d9c172c7659b252c538b45e7091c9de24

#

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -115,6 +115,39 @@
    @TableField("qty_box")
    private Double qtyBox;

    /**
     * å®¢æˆ·åç§°
     */
    @ApiModelProperty(value= "客户名称")
    private String str3;

    /**
     * é¡¹ç›®ä¿¡æ¯
     */
    @ApiModelProperty(value= "项目信息")
    private String str4;
    /**
     * ç±»åˆ«
     */
    @ApiModelProperty(value= "类别")
    private String str5;

    public String getStr5$(){
        if (Cools.isEmpty(this.str5) ){
            return "";
        }
        if (this.str5.equals("1")){
            return "原材料";
        }
        if (this.str5.equals("2")){
            return "成品";
        }
        if (this.str5.equals("3")){
            return "半成品";
        }
        return "";
    }

    public String getLocNo$(){
        LocMastService service = SpringUtils.getBean(LocMastService.class);
        LocMast locMast = service.selectById(this.locNo);

 src/main/java/com/zy/asrs/entity/PltBarcode.java

@@ -204,6 +204,39 @@
    @TableField("qty_box")
    private Double qtyBox;

    /**
     * å®¢æˆ·åç§°
     */
    @ApiModelProperty(value= "客户名称")
    private String str3;

    /**
     * é¡¹ç›®ä¿¡æ¯
     */
    @ApiModelProperty(value= "项目信息")
    private String str4;
    /**
     * ç±»åˆ«
     */
    @ApiModelProperty(value= "类别")
    private String str5;

    public String getStr5$(){
        if (Cools.isEmpty(this.str5) ){
            return "";
        }
        if (this.str5.equals("1")){
            return "原材料";
        }
        if (this.str5.equals("2")){
            return "成品";
        }
        if (this.str5.equals("3")){
            return "半成品";
        }
        return "";
    }

    public PltBarcode() {}

    public PltBarcode(String barcode,Double allQty,Double qtyBox,String source,String supplier,String vendor,Double allWeight,String billNo,Integer seqNo,Integer billType,String matNo,String matName,Double qty,String locNo,String specs,String unit,String size,String color,Double weight,String memo,Integer linkErp,Integer ioStatus,Date ioTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {

 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -166,6 +166,40 @@
    @ApiModelProperty(value= "每箱数量")
    @TableField("qty_box")
    private Double qtyBox;

    /**
     * å®¢æˆ·åç§°
     */
    @ApiModelProperty(value= "客户名称")
    private String str3;

    /**
     * é¡¹ç›®ä¿¡æ¯
     */
    @ApiModelProperty(value= "项目信息")
    private String str4;
    /**
     * ç±»åˆ«
     */
    @ApiModelProperty(value= "类别")
    private String str5;

    public String getStr5$(){
        if (Cools.isEmpty(this.str5) ){
            return "";
        }
        if (this.str5.equals("1")){
            return "原材料";
        }
        if (this.str5.equals("2")){
            return "成品";
        }
        if (this.str5.equals("3")){
            return "半成品";
        }
        return "";
    }

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";

 src/main/java/com/zy/asrs/entity/WrkDetlLog.java

@@ -159,7 +159,40 @@
    @ApiModelProperty(value = "每箱数量")
    @TableField("qty_box")
    private Double qtyBox;
    

    /**
     * å®¢æˆ·åç§°
     */
    @ApiModelProperty(value= "客户名称")
    private String str3;

    /**
     * é¡¹ç›®ä¿¡æ¯
     */
    @ApiModelProperty(value= "项目信息")
    private String str4;
    /**
     * ç±»åˆ«
     */
    @ApiModelProperty(value= "类别")
    private String str5;

    public String getStr5$(){
        if (Cools.isEmpty(this.str5) ){
            return "";
        }
        if (this.str5.equals("1")){
            return "原材料";
        }
        if (this.str5.equals("2")){
            return "成品";
        }
        if (this.str5.equals("3")){
            return "半成品";
        }
        return "";
    }

    public String getIoTime$(){
        if (Cools.isEmpty(this.ioTime)){
            return "";

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -106,6 +106,9 @@
                pltBarcode.setVendor(combMat.getVendor());
                pltBarcode.setSource(combMat.getSource());
                pltBarcode.setQtyBox(matCode.getStr6());
                pltBarcode.setStr3(matCode.getStr3());
                pltBarcode.setStr4(matCode.getStr4());
                pltBarcode.setStr5(matCode.getStr5());
                if (!pltBarcodeService.insert(pltBarcode)) {
                    throw new CoolException("保存数据失败");
                }

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -285,6 +285,9 @@
                wrkDetl.setVendor(detlDto.getLocDetl().getVendor());
                wrkDetl.setSource(detlDto.getLocDetl().getSource());
                wrkDetl.setSupplier(detlDto.getLocDetl().getSupplier());
                wrkDetl.setStr5(matCode.getStr5());
                wrkDetl.setStr4(matCode.getStr4());
                wrkDetl.setStr3(matCode.getStr3());
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
@@ -693,6 +696,9 @@
                locDetl.setQtyBox(matCode.getStr6());
                locDetl.setAllQty(matCode.getStr6()*adjust.getCount());
                locDetl.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
                locDetl.setStr3(matCode.getStr3());
                locDetl.setStr4(matCode.getStr4());
                locDetl.setStr5(matCode.getStr5());
                if (!locDetlService.insert(locDetl)) {
                    throw new CoolException("保存库存明细失败");
                }
@@ -725,6 +731,9 @@
                        sqlParam1.setQtyBox(matCode.getStr6());
                        sqlParam1.setAllQty(matCode.getStr6()*adjust.getCount());
                        sqlParam1.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
                        sqlParam1.setStr5(matCode.getStr5());
                        sqlParam1.setStr4(matCode.getStr4());
                        sqlParam1.setStr3(matCode.getStr3());
                        if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
                                .eq("loc_no", locMast.getLocNo())
                                .eq("mat_no", adjust.getMatNo())

 src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java

@@ -70,6 +70,9 @@
            wrkDetl.setVendor(dto.getVendor());
            wrkDetl.setWeight(matCode.getWeight());
            wrkDetl.setQtyBox(matCode.getStr6());
            wrkDetl.setStr3(matCode.getStr3());
            wrkDetl.setStr4(matCode.getStr4());
            wrkDetl.setStr5(matCode.getStr5());
            if (!this.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -124,7 +124,9 @@
                            locDetl.setVendor(wrk_no.getVendor());
                            locDetl.setWeight(matCode.getWeight());
                            locDetl.setQtyBox(matCode.getStr6());

                            locDetl.setStr3(matCode.getStr3());
                            locDetl.setStr4(matCode.getStr4());
                            locDetl.setStr5(matCode.getStr5());
                            if (!Cools.isEmpty(wrk_no)){
                                locDetl.setMemo(wrk_no.getMemo());
                                locDetl.setSupplier(wrk_no.getSupplier());

 src/main/resources/mapper/LocDetlMapper.xml

@@ -28,6 +28,9 @@
        <result column="source" property="source" />
        <result column="vendor" property="vendor" />
        <result column="qty_box" property="qtyBox"/>
        <result column="str3" property="str3" />
        <result column="str4" property="str4" />
        <result column="str5" property="str5"/>
    </resultMap>

    <sql id="stockOutCondition">

 src/main/resources/mapper/PltBarcodeMapper.xml

@@ -31,6 +31,9 @@
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />
        <result column="qty_box" property="qtyBox"/>
        <result column="str3" property="str3" />
        <result column="str4" property="str4" />
        <result column="str5" property="str5"/>
    </resultMap>

</mapper>

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -30,6 +30,9 @@
        <result column="source" property="source" />
        <result column="vendor" property="vendor" />
        <result column="qty_box" property="qtyBox"/>
        <result column="str3" property="str3" />
        <result column="str4" property="str4" />
        <result column="str5" property="str5"/>
    </resultMap>

</mapper>

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -30,6 +30,9 @@
        <result column="source" property="source" />
        <result column="vendor" property="vendor" />
        <result column="qty_box" property="qtyBox"/>
        <result column="str3" property="str3" />
        <result column="str4" property="str4" />
        <result column="str5" property="str5"/>
    </resultMap>

    <select id="queryWrkDetl" resultMap="BaseResultMap">

 src/main/webapp/static/js/common.js

@@ -197,6 +197,6 @@
    ,{field: 'str3', align: 'center', title: '客户名称'}
    ,{field: 'str4', align: 'center', title: '项目信息'}
    ,{field: 'str5$', align: 'center', title: '类别'}
    ,{field: 'str6', align: 'center', title: '每箱数量(PCS)'}
    ,{field: 'qtyBox', align: 'center', title: '每箱数量(PCS)'}
]


 src/main/webapp/static/js/locDetl/locDetl.js

@@ -16,7 +16,11 @@
        ,{field: 'color', align: 'center',title: '颜色'}
        ,{field: 'zpallet', align: 'center',title: '托盘条码'}
        // ,{field: 'bname', align: 'center',title: '库位名称'}
        ,{field: 'memo', align: 'center',title: '生产日期'}];
        ,{field: 'memo', align: 'center',title: '生产日期'}
        ,{field: 'str3', align: 'center',title: '客户名称'}
        ,{field: 'str4', align: 'center',title: '项目信息'}
        ,{field: 'str5$', align: 'center',title: '类别'}
         ];
    // cols.push.apply(cols, detlCols);
    cols.push({field: 'modiUser$', align: 'center',title: '修改人员',hide: true}
        ,{field: 'modiTime$', align: 'center',title: '修改时间'}

 src/main/webapp/static/js/pakStore/pakStore.js

@@ -43,19 +43,26 @@

    // é¡µé¢ä¿®æ”¹
    table.on('edit(chooseData)', function (obj) {
        // var index  = ;
        // console.log(obj.tr.parents('tr'))
        // console.log($('obj').othis)
        // console.log(obj.parents('tr').attr("data-index"));
        switch (obj.field) {
            case 'count':
                updateMatCodeData(obj.data.matNo, obj.data.supplier, Number(obj.value));
                break
            case 'supplier':
                // updateMatCodeSupplier(obj.data.matNo, obj.value);
                // debugger
                for (var i=0;i<matCodeData.length;i++){
                    if (matCodeData[i]["matNo"] === obj.data.matNo
                    && (matCodeData[i]["supplier"] === obj.data.supplier || matCodeData[i]["supplier"]==='')){
                    if (matCodeData[i]["matNo"] === obj.data.matNo){
                        matCodeData[i]["supplier"] = obj.data.supplier;
                    }
                }
                // tableIns.reload({data: matCodeData,done:function (res) {
                //         limit();
                //         // getInBound();
                //         // è¦†ç›–render方法的done
                //     }});
                break
            case 'source':
                for (var i=0;i<matCodeData.length;i++){
@@ -73,7 +80,21 @@
                    }
                }
                break;

            // case 'memo':
            //     for (var i=0;i<matCodeData.length;i++){
            //         if (matCodeData[i]["matNo"] === obj.data.matNo
            //             && (matCodeData[i]["supplier"] === obj.data.supplier || matCodeData[i]["supplier"]==='')){
            //             matCodeData[i]["memo"] = obj.data.memo;
            //         }
            //     }
            //     break;
        }
        tableIns.reload({data: matCodeData,done:function (res) {
                limit();
                getInBound();
                // è¦†ç›–render方法的done
            }});

    });

@@ -128,12 +149,11 @@

    // ç›‘听行工具事件
    table.on('tool(chooseData)', function(obj){
        var data = obj.data;

        switch (obj.event) {
            case 'remove':
                for (var i = matCodeData.length - 1; i >= 0; i--) {
                    if (matCodeData[i].matNo === data.matNo) {
                    if (matCodeData[i].matNo === obj.data.matNo) {
                        matCodeData.splice(i, 1);
                    }
                }
@@ -156,7 +176,7 @@
                    yes:  function(index, layero){
                        var memo = layer.getChildFrame('body', index).find("#memo")[0].value;
                        matCodeData.map(function (item) {
                            if (item.matNo === data.matNo && item.supplier === data.supplier) {
                            if (item.matNo === obj.data.matNo && item.supplier === obj.data.supplier) {
                                item.memo = memo;
                            }
                        });

 src/main/webapp/static/js/pakStore/stockAdjust.js

@@ -12,7 +12,9 @@
        {field: 'supplier', title: '批号', align: 'center', width: 120},
        {field: 'source', title: '来源', align: 'center', edit:'text', width: 120},
        {field: 'vendor', title: '供应商', align: 'center', edit:'text', width: 120}
        ,{field: 'qtyBox', align: 'center', title: '每箱数量(PCS)'}
        ,{field: 'str3', align: 'center',title: '客户名称'}
        ,{field: 'str4', align: 'center',title: '项目信息'}
        ,{field: 'str5$', align: 'center',title: '类别'}
        // {field: 'allqty', title: '总数量', align: 'center'},
        // {field: 'allweight', title: '总重量', align: 'center'}
        // ,{field: 'anfme', align: 'center',title: '数量'}

 src/main/webapp/static/js/pltBarcode/pltBarcode.js

@@ -41,6 +41,9 @@
            ,{field: 'supplier', align: 'center',title: '批号'}
            ,{field: 'vendor', align: 'center',title: '供应商'}
            ,{field: 'memo', align: 'center',title: '生产日期'}
            ,{field: 'str3', align: 'center',title: '客户名称'}
            ,{field: 'str4', align: 'center',title: '项目信息'}
            ,{field: 'str5$', align: 'center',title: '类别'}
            ,{field: 'linkErp$', align: 'center',title: 'ERP连线', hide: true}
            ,{field: 'ioStatus$', align: 'center',title: '完成状态'}
            ,{field: 'ioTime$', align: 'center',title: '完成时间', hide: true}

 src/main/webapp/static/js/wrkDetl/wrkDetl.js

@@ -12,6 +12,9 @@
        ,{field: 'source', align: 'center',title: '来源'}
        ,{field: 'vendor', align: 'center',title: '供应商'}
        ,{field: 'billNo', align: 'center',title: '单据编号', hide:true}
        ,{field: 'str3', align: 'center',title: '客户名称'}
        ,{field: 'str4', align: 'center',title: '项目信息'}
        ,{field: 'str5$', align: 'center',title: '类别'}
        ,{field: 'seqNo', align: 'center',title: '序号', width:80, hide:true}
        ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
        ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true})

 src/main/webapp/static/js/wrkDetlLog/wrkDetlLog.js

@@ -9,6 +9,9 @@
        ,{field: 'allWeight', align: 'center',title: '总重量(KG)'}
        ,{field: 'source', align: 'center',title: '来源'}
        ,{field: 'vendor', align: 'center',title: '供应商'}
        ,{field: 'str3', align: 'center',title: '客户名称'}
        ,{field: 'str4', align: 'center',title: '项目信息'}
        ,{field: 'str5$', align: 'center',title: '类别'}
    ];
    cols.push.apply(cols, detlCols);
    cols.push({field: 'modiUser$', align: 'center',title: '修改人员',hide: true}

 src/main/webapp/views/pakStore/locDetlCheckQuery.html

@@ -99,7 +99,11 @@
            ,{field: 'locNo$', align: 'center',title: '库位号'}
        ];
        cols.push.apply(cols, detlCols);
        cols.push({field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
        cols.push(
            {field: 'str3', align: 'center',title: '客户名称'}
            ,{field: 'str4', align: 'center',title: '项目信息'}
            ,{field: 'str5$', align: 'center',title: '类别'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员', hide: true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'})
        return cols;
    }

 src/main/webapp/views/pakStore/locDetlQuery.html

@@ -113,6 +113,9 @@
            ,{field: 'zpallet', align: 'center',title: '托盘条码'}
            // ,{field: 'bname', align: 'center',title: '库位名称'}
            ,{field: 'memo', align: 'center',title: '生产日期'}
            ,{field: 'str3', align: 'center',title: '客户名称'}
            ,{field: 'str4', align: 'center',title: '项目信息'}
            ,{field: 'str5$', align: 'center',title: '类别'}
        ];
        // cols.push.apply(cols, detlCols);
        

 src/main/webapp/views/report/locDetl.html

@@ -50,6 +50,9 @@
            ,{field: 'zpallet', align: 'center',title: '托盘条码'}
            // ,{field: 'bname', align: 'center',title: '库位名称'}
            ,{field: 'memo', align: 'center',title: '生产日期'}
            ,{field: 'str3', align: 'center',title: '客户名称'}
            ,{field: 'str4', align: 'center',title: '项目信息'}
            ,{field: 'str5$', align: 'center',title: '类别'}
        ];
        // cols.push.apply(cols, detlCols);
        return cols;

 src/main/webapp/views/wrkMast/wrkDetl.html

@@ -48,6 +48,9 @@
            ,{field: 'zpallet', align: 'center',title: '托盘条码'}
            // ,{field: 'bname', align: 'center',title: '库位名称'}
            ,{field: 'memo', align: 'center',title: '生产日期'}
            ,{field: 'str3', align: 'center',title: '客户名称'}
            ,{field: 'str4', align: 'center',title: '项目信息'}
            ,{field: 'str5$', align: 'center',title: '类别'}
        ];
        // cols.push.apply(cols, detlCols);
        

 version/db/sxjzasrs20220211.bak

Binary files differ

 version/db/½ÝÖÚÊý¾Ý¿âÔö¼Ó×Ö¶ÎÁбí.txt

@@ -1,13 +1,16 @@

组托表（plt_barcode和plt_barcode_log)有：all_qty(总数量，浮点类型)   all_weight(总重量，浮点类型)   
组托表（plt_barcode和plt_barcode_log)新增有：all_qty(总数量，浮点类型)   all_weight(总重量，浮点类型)
source(来源，字符串)  supplier(批号，字符串)   vendor(供应商，字符串)   qty_box(每箱数量，浮点类型)
str3（客户名称，字符串） str4（项目信息，字符串） str5（类别，字符串）


工作档（wrk_detl和wrk_detl_log）有：all_qty(总数量，浮点类型)   all_weight(总重量，浮点类型)
source(来源，字符串)   vendor(供应商，字符串)  qty_box(每箱数量，浮点类型)
工作档（wrk_detl和wrk_detl_log）新增有：all_qty(总数量，浮点类型)   all_weight(总重量，浮点类型)
source(来源，字符串)   vendor(供应商，字符串)  qty_box(每箱数量，浮点类型)  supplier改为主键（wrk_detl_log不改）
str3（客户名称，字符串） str4（项目信息，字符串） str5（类别，字符串）

库存表（loc_detl）有：all_qty(总数量，浮点类型)   all_weight(总重量，浮点类型)
库存表（loc_detl）新增有：all_qty(总数量，浮点类型)   all_weight(总重量，浮点类型)
source(来源，字符串)   vendor(供应商，字符串)  qty_box(每箱数量，浮点类型)   supplier改为主键
str3（客户名称，字符串） str4（项目信息，字符串） str5（类别，字符串）


物料表（mat_code）变更有：str3（客户名称，字符串） str4（项目信息，字符串） str5（类别，字符串）