Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs

wang..123

2022-02-18 4901728f970314cddd9fa167cf3d3fb9476208e5

Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs

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

@@ -24,9 +24,9 @@
            int updateCount = jdbcTemplate.update("insert into asr_stk_hplc select * from asr_stk_plcm where dateadd(day,7,appe_time) <= getdate();");
            if (updateCount > 0) {
                int deleteCount = jdbcTemplate.update("delete from asr_stk_plcm where dateadd(day,7,io_time) <= getdate();");
                if (deleteCount <= 0) {
                    exceptionHandle("堆垛机&PLC命令转历史档错误 ! ");
                }
//                if (deleteCount <= 0) {
//                    exceptionHandle("堆垛机&PLC命令转历史档错误 ! ");
//                }
            }

//            //条码组托数据转历史档 2021-09-10 TQS ADD

 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(), null, elem.getQty(),elem.getSource(),elem.getVendor()));
            matDtos.add(new MatCodeCountDto(elem.getBillNo(), elem.getSeqNo(), elem.getMatNo(), elem.getSupplier(), elem.getQty(),elem.getSource(),elem.getVendor()));

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

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

@@ -9,7 +9,7 @@
    arrRemove(detlCols, "field", "str6")
    var cols = [
        {fixed: 'left', field: 'count', title: '实际数量', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
        // {field: 'supplier', title: '批号', align: 'center', edit:'text', width: 120},
        {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)'}

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

@@ -124,7 +124,7 @@
            var checkStatus = table.checkStatus(obj.config.id);
            var data = checkStatus.data;
            for(i=0;i<data.length;i++){
                data[i].supplier='';
                data[i].supplier='0';
            }
            // debugger
            switch(obj.event) {

 src/main/webapp/views/pda/matQuery.html

@@ -90,7 +90,7 @@
    </div>
    <div class="form-item">
        <span>批号</span>
        <input id="supplier" type="text">
        <input id="supplier" value="0" type="text">
    </div>
    <div class="form-item">
        <span>生产日期</span>