#

wang..123

2022-02-18 85deecd28f589f280a3db19fb35fcb6d9081b781

#

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

@@ -63,7 +63,7 @@
        this.vendor= vendor;
    }

    public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count,String source, String vendor) {
    public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count,String source, String vendor,String memo) {
        this.matNo = matNo;
        this.count = count;
        this.billNo = billNo;
@@ -71,6 +71,7 @@
        this.seqNo = seqNo;
        this.source = source;
        this.vendor= vendor;
        this.memo=memo;
    }

    public MatCodeCountDto(String billNo, Integer seqNo, String matNo, String supplier, Double count) {

 src/main/java/com/zy/asrs/entity/param/StockOutParam.java

@@ -46,6 +46,16 @@
        // 数量
        private Double count;

        private String supplier;

        public String getSupplier() {
            return supplier;
        }

        public void setSupplier(String supplier) {
            this.supplier = supplier;
        }

        public String getBillNo() { return billNo; }

        public void setBillNo(String billNo) { this.billNo = billNo; }

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

@@ -106,7 +106,6 @@
                pltBarcode.setVendor(combMat.getVendor());
                pltBarcode.setSource(combMat.getSource());
                pltBarcode.setQtyBox(matCode.getStr6());
                pltBarcode.setMemo(combMat.getMemo());
                if (!pltBarcodeService.insert(pltBarcode)) {
                    throw new CoolException("保存数据失败");
                }

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

@@ -284,6 +284,7 @@
                wrkDetl.setAllQty(qty*matCode.getStr6());
                wrkDetl.setVendor(detlDto.getLocDetl().getVendor());
                wrkDetl.setSource(detlDto.getLocDetl().getSource());
                wrkDetl.setSupplier(detlDto.getLocDetl().getSupplier());
                if (!wrkDetlService.insert(wrkDetl)) {
                    throw new CoolException("保存工作档明细失败");
                }
@@ -498,6 +499,7 @@
                LocDetl sqlParam = new LocDetl();
                sqlParam.setLocNo(paramLocDetl.getLocNo());
                sqlParam.setMatNo(paramLocDetl.getMatNo());
                sqlParam.setSupplier(paramLocDetl.getSupplier());
                LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
                if (null != one) locDetlDtos.add(new LocDetlDto(one, one.getQty()));
            }

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

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

                            if (!Cools.isEmpty(wrk_no)){
                                locDetl.setMemo(wrk_no.getMemo());
                                locDetl.setSupplier(wrk_no.getSupplier());

 src/main/java/com/zy/common/web/WcsController.java

@@ -140,7 +140,7 @@
        // 生成工作档明细
        List<MatCodeCountDto> matDtos = new ArrayList<>();
        pltBarcodes.forEach(elem -> {
            matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor()));
            matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor(),elem.getMemo()));

            //更新组托数据状态为入库中
            Wrapper<PltBarcode> wrapper = new EntityWrapper<PltBarcode>().eq("barcode", elem.getBarcode())

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

@@ -192,7 +192,7 @@
    ,{field: 'color', align: 'center',title: '颜色'}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}
    // ,{field: 'bname', align: 'center',title: '库位名称'}
    ,{field: 'memo', align: 'center',title: '备注', hide: true}
    ,{field: 'memo', align: 'center',title: '生产日期',}
    ,{field: 'weight', align: 'center', title: '每箱重量(KG)'}
    ,{field: 'str3', align: 'center', title: '客户名称'}
    ,{field: 'str4', align: 'center', title: '项目信息'}

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

@@ -53,11 +53,12 @@
                    data.forEach(function(elem) {
                        console.log(elem)
                        // locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); // todo
                        locDetls.push({locNo: elem.locNo, matNo: elem.matNo});
                        locDetls.push({locNo: elem.locNo, matNo: elem.matNo, supplier:elem.supplier});
                    });
                    let param = {
                        outSite: staNo,
                        locDetls: locDetls

                    }
                    $.ajax({
                        url: baseUrl+"/locCheck/out/start",

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

@@ -12,7 +12,7 @@
    ];
    cols.push.apply(cols, matCols);
    cols.push(
        {field: 'memo', title:'备注', align: 'center'},
        {field: 'memo', title:'生产日期', align: 'center'},
        {fixed: 'right', title:'操作', align: 'center', toolbar: '#operate', width:120}
        )
    return cols;

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

@@ -40,7 +40,7 @@
            ,{field: 'source', align: 'center',title: '来源'}
            ,{field: 'supplier', align: 'center',title: '批号'}
            ,{field: 'vendor', align: 'center',title: '供应商'}
            ,{field: 'memo', align: 'center',title: '备注', hide: true}
            ,{field: 'memo', 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/views/pakStore/pakStore.html

@@ -108,7 +108,7 @@

    <!-- 行 -->
    <script type="text/html" id="operate">
        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="memo">备注</a>
        <a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="memo">生产日期</a>
        <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="remove">移除</a>
    </script>


 version/db/sxjzasrs20220211.bak

Binary files differ