#

luxiaotao1123

2022-12-13 65d4a072e6a382b9583cae85d5c6e59685c2c1c5

#

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -443,7 +443,7 @@
            String uuid = dataFormatter.formatCellValue(row.getCell(0));
            // 物料号
            String maktx = dataFormatter.formatCellValue(row.getCell(1));
            // 单据号
            // 物料号
            String matnr = dataFormatter.formatCellValue(row.getCell(2));
            // 数量
            Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));

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

@@ -38,9 +38,9 @@
    private String locNo;

    /**
     * 单据号
     * 物料号
     */
    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**

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

@@ -46,9 +46,9 @@
    private String docName;

    /**
     * 单据号
     * 物料号
     */
    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**
@@ -94,7 +94,7 @@
//            null,    // 单据编号
//            null,    // 单据类型
//            null,    // 单据名称
//            null,    // 单据号
//            null,    // 物料号
//            null,    // 上报数量
//            null,    // 结果
//            null,    // 上报时间

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

@@ -35,8 +35,8 @@
    @ExcelProperty("数量")
    private Double anfme;

    @ApiModelProperty(value= "单据号")
    @ExcelProperty("单据号")
    @ApiModelProperty(value= "物料号")
    @ExcelProperty("物料号")
    private String matnr;

    @ApiModelProperty(value= "物料号")

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

@@ -56,10 +56,10 @@
    private Long tagId;

    /**
     * 单据号
     * 物料号
     */
    @ApiModelProperty(value= "单据号")
    @ExcelProperty(value = "单据号")
    @ApiModelProperty(value= "物料号")
    @ExcelProperty(value = "物料号")
    private String matnr;


@@ -351,7 +351,7 @@
//    Mat mat = new Mat(
//            null,    // 编号
//            null,    // 所属归类
//            null,    // 单据号
//            null,    // 物料号
//            null,    // 物料号
//            null,    // 移动类型
//            null,    // 规格

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

@@ -6,7 +6,7 @@
public class MatCodePrint {

    /**
     * 单据号
     * 物料号
     */
    private String matNo;


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

@@ -62,9 +62,9 @@
    private Double qty;

    /**
     * 单据号
     * 物料号
     */
    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**

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

@@ -43,9 +43,9 @@
    private String barcode;

    /**
     * 单据号
     * 物料号
     */
    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**
@@ -119,7 +119,7 @@

//    Pack pack = new Pack(
//            null,    // 条码[非空]
//            null,    // 单据号
//            null,    // 物料号
//            null,    // 序列码
//            null,    // 订单状态
//            null,    // 状态

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

@@ -38,7 +38,7 @@
    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    @ApiModelProperty(value= "物料号")

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

@@ -48,7 +48,7 @@
    @ApiModelProperty(value= "数量")
    private Double anfme;

    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    @ApiModelProperty(value= "物料号")

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

@@ -27,7 +27,7 @@
    @TableField("loc_no")
    private String locNo;

    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    @ApiModelProperty(value= "物料号")

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

@@ -26,7 +26,7 @@
    @TableField("loc_no")
    private String locNo;

    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    @ApiModelProperty(value= "物料号")

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

@@ -49,7 +49,7 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**

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

@@ -48,7 +48,7 @@
    /**
     * 物料
     */
    @ApiModelProperty(value= "单据号")
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**

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

@@ -21,7 +21,7 @@
    @Data
    public static class LocDetlAdjust {

        // 单据号
        // 物料号
        private String matnr;

        // 序列码

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

@@ -22,7 +22,7 @@
        // 库位号
        private String locNo;

        // 单据号
        // 物料号
        private String matnr;

        // 序列码

 src/main/java/com/zy/asrs/service/LocDetlService.java

@@ -30,7 +30,7 @@

    /**
     * 获取当天相同规格货物的深库位号
     * @param matnr 单据号
     * @param matnr 物料号
     * @return locNo 库位号
     */
    List<String> getSameDetlToday(String matnr, Integer start, Integer end);

 src/main/java/com/zy/asrs/service/OrderDetlService.java

@@ -28,6 +28,6 @@

    List<OrderDetl> selectRemainder(Long orderId);

    OrderDetl selectByMatnr(String matnr);
    OrderDetl selectContainBatch(String batch);

}

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

@@ -337,7 +337,7 @@
        Date now = new Date();
        pack = new Pack(
                param.getBarcode(),    // 条码[非空]
                analyse.getMatnr(),    // 单据号
                analyse.getMatnr(),    // 物料号
                analyse.getBarcode(),    // 序列码
                1L,    // 订单状态
                1,    // 状态
@@ -433,7 +433,7 @@
            if (!matService.insert(mat)) {
                throw new CoolException("服务器内部错误，请联系管理员");
            } else {
                log.info("打包上线添加新物料[单据号：{}]", mat.getMatnr());
                log.info("打包上线添加新物料[物料号：{}]", mat.getMatnr());
            }
        }
    }

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

@@ -81,16 +81,17 @@
    }

    @Override
    public OrderDetl selectByMatnr(String matnr) {
        List<OrderDetl> orderDetls = this.baseMapper.selectByMatnr(matnr);
        if (!Cools.isEmpty(orderDetls)) {
            if (orderDetls.size() > 1) {
                log.error("{}条码同时存在多笔订单，请注意查看！", matnr);
            } else {
                return orderDetls.get(0);
            }
        }
        return null;
    public OrderDetl selectContainBatch(String batch) {
        OrderDetl orderDetl = this.selectOne(new EntityWrapper<OrderDetl>().like("batch", batch));
        return orderDetl;
//        if (!Cools.isEmpty(orderDetls)) {
//            if (orderDetls.size() > 1) {
//                log.error("{}条码同时存在多笔订单，请注意查看！", matnr);
//            } else {
//                return orderDetls.get(0);
//            }
//        }
//        return null;
    }



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

@@ -951,11 +951,7 @@

    @Override
    public StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId) {
        if (Cools.isEmpty(list)) {
            throw new CoolException("入库通知档不能为空");
        }
        LocTypeDto locTypeDto = new LocTypeDto();
        return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), locTypeDto, null);
        return null;
    }

    @Override

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

@@ -74,16 +74,16 @@
                    if (!Cools.isEmpty(wrkDetls)) {
                        for (WrkDetl wrkDetl : wrkDetls) {
                            // Goods 表
                            Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
                            Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
                            if (!Cools.isEmpty(goods)) {
                                if (!erpService.updateStateAndLocForGoods(goods.getBarCode(), 3, wrkMast.getLocNo())) {
                                    log.error("{}条码在erp数据库中更新失败！", goods.getBarCode());
                                }
                            } else {
                                log.error("{}条码不在erp数据库中！", wrkDetl.getMatnr());
                                log.error("{}条码不在erp数据库中！", wrkDetl.getBatch());
                            }
                            // OrderDetl 表
                            OrderDetl orderDetl = orderDetlService.selectByMatnr(wrkDetl.getMatnr());
                            OrderDetl orderDetl = orderDetlService.selectContainBatch(wrkDetl.getMatnr());
                            if (!Cools.isEmpty(orderDetl)) {
                                Order order = orderService.selectById(orderDetl.getOrderId());
                                DocType docType = docTypeService.selectById(order.getDocType());

 src/main/java/com/zy/asrs/utils/MatExcelListener.java

@@ -132,7 +132,7 @@
            mat = excel;
            mat.setTagId(tagId);
            if (!matService.insert(mat)) {
                throw new CoolException("保存商品信息失败，单据号：" + excel.getMatnr());
                throw new CoolException("保存商品信息失败，物料号：" + excel.getMatnr());
            }
            total++;
        }

 src/main/java/com/zy/common/model/MesPakoutParam.java

@@ -1,11 +1,8 @@
package com.zy.common.model;

import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import lombok.Data;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

/**
@@ -52,20 +49,5 @@
        }
    }

    public static void main(String[] args) {
        MesPakoutParam param = new MesPakoutParam();
        param.setTag(true);
        param.setOrderNo("8135998");
        param.setPakoutTime(DateUtils.convert(new Date()));
        param.setLgortFrom("5006");
        param.setLgortTo("1111");


        Detl detl = new Detl();  param.getList().add(detl);
        detl.setBarcode("1100146-10000-23132132");
        detl.setAnfme(1.0D);

        System.out.println(JSON.toJSONString(param));
    }

}

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -56,12 +56,12 @@
        Date now = new Date();
        if (!Cools.isEmpty(goods)) {
            for (Goods good : goods) {
                Mat mat = matService.selectByMatnr(good.getBarCode());
                Mat mat = matService.selectByMatnr(good.getMaterialNO());
                if (mat == null) {
                    mat = new Mat();
                    mat.setTagId(top.getId());
                    mat.setMatnr(good.getBarCode());
                    mat.setMaktx(good.getMaterialNO());
                    mat.setMatnr(good.getMaterialNO());
//                    mat.setMaktx(good.getBarCode());
                    mat.setSpecs(good.getProdSpec());
                    mat.setModel(good.getBatch());
                    mat.setWeight(good.getNWT());
@@ -144,30 +144,61 @@
                if (!orderService.insert(order)) {
                    throw new CoolException(order.getOrderNo() + "生成单据主档失败，请联系管理员");
                }
                for (VoucherDetail detail : dto.getDetails()) {

                    Mat mat = matService.selectByMatnr(detail.getBarcode());
                    if (mat == null) {
                        throw new CoolException(detail.getBarcode() + "单据号不存在");
                    }

                    OrderDetl orderDetl = new OrderDetl();
                    orderDetl.sync(mat);
//                    orderDetl.setBatch(detlDto.getBatch());
                    orderDetl.setAnfme(1.0D);
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(order.getOrderNo());
                    orderDetl.setCreateBy(9527L);
                    orderDetl.setCreateTime(now);
                    orderDetl.setUpdateBy(9527L);
                    orderDetl.setUpdateTime(now);
                    orderDetl.setStatus(1);
                    orderDetl.setQty(0.0D);
                    if (!orderDetlService.insert(orderDetl)) {
                        throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
                    }
                Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
                if (mat == null) {
                    throw new CoolException(voucher.getMaterialNO() + "物料号不存在");
                }

                OrderDetl orderDetl = new OrderDetl();
                orderDetl.sync(mat);
                StringBuilder sb = new StringBuilder();
                if (!Cools.isEmpty(dto.getDetails())) {
                    for (VoucherDetail detail : dto.getDetails()) {
                        sb.append(detail.getBarcode()).append(",");
                    }
                    orderDetl.setBatch(sb.toString());
                }
                orderDetl.setAnfme(voucher.getExpectedWeight());
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setCreateBy(9527L);
                orderDetl.setCreateTime(now);
                orderDetl.setUpdateBy(9527L);
                orderDetl.setUpdateTime(now);
                orderDetl.setStatus(1);
                orderDetl.setQty(0.0D);
                if (!orderDetlService.insert(orderDetl)) {
                    throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
                }

//                else {
//                    for (VoucherDetail detail : dto.getDetails()) {
//
//                        Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
//                        if (mat == null) {
//                            throw new CoolException(voucher.getMaterialNO() + "物料号不存在");
//                        }
//
//                        OrderDetl orderDetl = new OrderDetl();
//                        orderDetl.sync(mat);
////                    orderDetl.setBatch(detlDto.getBatch());
//                        orderDetl.setAnfme(1.0D);
//                        orderDetl.setOrderId(order.getId());
//                        orderDetl.setOrderNo(order.getOrderNo());
//                        orderDetl.setCreateBy(9527L);
//                        orderDetl.setCreateTime(now);
//                        orderDetl.setUpdateBy(9527L);
//                        orderDetl.setUpdateTime(now);
//                        orderDetl.setStatus(1);
//                        orderDetl.setQty(0.0D);
//                        if (!orderDetlService.insert(orderDetl)) {
//                            throw new CoolException(order.getOrderNo() + "生成单据明细失败，请联系管理员");
//                        }
//                    }
//                }

                // erp 同步
                int state = 1;
                if (!erpService.updateStateForVoucher(voucher.getVoucherID(), state)) {

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

@@ -9,6 +9,8 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.Goods;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,8 @@
    private LocDetlService locDetlService;
    @Autowired
    private MatService matService;
    @Autowired
    private ErpService erpService;

    @PostMapping("/pakin/loc/v1")
    @ResponseBody
@@ -60,9 +64,13 @@
            if (Cools.isEmpty(param.getBarcode())) {
                return R.error("条码不能为空");
            }
            mat = matService.selectByMatnr(param.getBarcode());
            Goods goods = erpService.selectGoodsOne(param.getBarcode());
            if (Cools.isEmpty(goods)) {
                return R.error(param.getBarcode() + "条码不存在，请检查ERP数据！");
            }
            mat = matService.selectByMatnr(goods.getMaterialNO());
            if (Cools.isEmpty(mat)) {
                return R.error(param.getBarcode() + "条码商品资料不存在，请先添加！");
                return R.error(goods.getMaterialNO() + "条码商品资料不存在，请先添加！");
            }
//            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
//            if (Cools.isEmpty(waitPakins)) {
@@ -90,7 +98,7 @@
        switch (param.getIoType()) {
            case 1://满托盘入库
                assert mat != null;
                dto = startupFullPutStore(param.getSourceStaNo(), null, locTypeDto, mat);
                dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mat);
                break;
            case 10://空托盘入库
                dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, null);
@@ -117,7 +125,7 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        // 检索库位
        List<Mat> mats = Collections.singletonList(mat);
        List<String> matnrList = mats.stream().map(Mat::getMaktx).distinct().collect(Collectors.toList());
        List<String> matnrList = mats.stream().map(Mat::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto,0);
        int workNo = dto.getWorkNo();
        Date now = new Date();
@@ -152,6 +160,7 @@
        WrkDetl wrkDetl = new WrkDetl();
        wrkDetl.sync(mat);
        wrkDetl.setAnfme(mat.getWeight());
        wrkDetl.setBatch(barcode);
//        wrkDetl.setAnfme(1.0D);
        wrkDetl.setWrkNo(wrkMast.getWrkNo());
        wrkDetl.setIoTime(wrkMast.getIoTime());

 src/main/resources/mapper/LocDetlMapper.xml

@@ -314,7 +314,7 @@
            group by loc_no
        ) dual on dual.loc_no = lm.loc_no
        WHERE 1 = 1
        AND ld.maktx = #{matnr}
        AND ld.matnr = #{matnr}
        AND (lm.row1 >= #{start} AND lm.row1 &lt;= #{end})
        AND (lm.loc_sts = 'F')
        AND dual.count = 1

 src/main/webapp/static/js/adjDetl/adjDetl.js

@@ -22,7 +22,7 @@
//            ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
//             {field: 'adjId', align: 'center',title: '序号'}
            {field: 'locNo', align: 'center',title: '库位号'}
            ,{field: 'matnr', align: 'center',title: '单据号'}
            ,{field: 'matnr', align: 'center',title: '物料号'}
            ,{field: 'batch', align: 'center',title: '序列码'}
            // ,{field: 'oriCtns', align: 'center',title: '原箱数'}
            ,{field: 'oriQty', align: 'center',title: '原数量'}

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

@@ -181,9 +181,9 @@
}

var matCols = [
    {field: 'matnr', align: 'center',title: '单据号', width: 180}
    {field: 'matnr', align: 'center',title: '物料号', width: 180}
    ,{field: 'name', align: 'center',title: '移动类型'}
    ,{field: 'maktx', align: 'center',title: '物料号', width: 150}
    // ,{field: 'maktx', align: 'center',title: '物料号', width: 150}
    ,{field: 'specs', align: 'center',title: '规格'}
    ,{field: 'model', align: 'center',title: '批次', hide: false}
    ,{field: 'manuDate', align: 'center',title: '单据时间', hide: false}
@@ -220,9 +220,9 @@
]

var detlCols = [
    {field: 'matnr', align: 'center',title: '单据号', width: 180}
    {field: 'matnr', align: 'center',title: '物料号', width: 180}
    ,{field: 'name', align: 'center',title: '移动类型'}
    ,{field: 'maktx', align: 'center',title: '物料号'}
    // ,{field: 'maktx', align: 'center',title: '物料号'}
    ,{field: 'specs', align: 'center',title: '规格'}
    ,{field: 'model', align: 'center',title: '批次', hide: true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}

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

@@ -2,7 +2,7 @@
function getCol() {
    var cols = [
        {field: 'locNo$', align: 'center',title: '库位号'},
        {field: 'matnr', align: 'center',title: '单据号', sort:true}
        {field: 'matnr', align: 'center',title: '物料号', sort:true}
        ,{field: 'maktx', align: 'center',title: '物料号', sort:true}
        ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
        ,{field: 'batch', align: 'center',title: '序列码', width: 300, sort:true}

 src/main/webapp/static/js/order/order.js

@@ -129,7 +129,7 @@
                        cellMinWidth: 100,
                        cols: [[
                            {type: 'numbers'},
                            {field: 'matnr', title: '单据号', width: 160},
                            {field: 'matnr', title: '物料号', width: 160},
                            {field: 'maktx', title: '物料号', width: 160},
                            {field: 'batch', title: '序列码'},
                            {field: 'anfme', title: '数量'},
@@ -236,7 +236,7 @@
                    cellMinWidth: 100,
                    cols: [[
                        {type: 'numbers', title: '#'},
                        {field: 'matnr', title: '单据号', width: 160},
                        {field: 'matnr', title: '物料号', width: 160},
                        {field: 'maktx', title: '物料号', width: 200},
                        {field: 'batch', title: '序列码', edit: true},
                        {field: 'specs', title: '规格'},

 src/main/webapp/static/js/order/out.js

@@ -32,7 +32,7 @@
            {type: 'checkbox'}
            ,{type: 'numbers', title: '#'}
            ,{field: 'orderNo', align: 'center',title: '单据编号', templet: '#orderNoTpl', width: 160}
            ,{field: 'matnr', align: 'center',title: '单据号', width: 160}
            ,{field: 'matnr', align: 'center',title: '物料号', width: 160}
            ,{field: 'maktx', align: 'center',title: '物料号', width: 200}
            ,{field: 'batch', align: 'center',title: '序列码'}
            ,{field: 'specs', align: 'center',title: '规格'}
@@ -385,7 +385,7 @@
                                cellMinWidth: 100,
                                cols: [[
                                    {type: 'checkbox'},
                                    {field: 'matnr', title: '单据号', align: 'center', width: 350},
                                    {field: 'matnr', title: '物料号', align: 'center', width: 350},
                                    {field: 'maktx', title: '物料号', align: 'center'},
                                    {field: 'specs', title: '规格', align: 'center'},
                                    {field: 'batch', title: '批号', align: 'center'},

 src/main/webapp/static/js/orderDetl/orderDetl.js

@@ -25,7 +25,7 @@
            ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'orderId$', align: 'center',title: '订单内码'}
            ,{field: 'anfme', align: 'center',title: '数量'}
            ,{field: 'matnr', align: 'center',title: '单据号'}
            ,{field: 'matnr', align: 'center',title: '物料号'}
            ,{field: 'maktx', align: 'center',title: '物料号'}
            ,{field: 'name', align: 'center',title: '名称'}
            ,{field: 'specs', align: 'center',title: '规格'}

 src/main/webapp/static/js/pack/pack.js

@@ -24,7 +24,7 @@
            {type: 'checkbox'}
            // ,{field: 'id', align: 'center',title: 'ID'}
            ,{field: 'barcode',title: '条码'}
            ,{field: 'matnr', align: 'center',title: '单据号', minWidth: 250, width: 250}
            ,{field: 'matnr', align: 'center',title: '物料号', minWidth: 250, width: 250}
            ,{field: 'batch', align: 'center',title: '序列码', hide: true}
            ,{field: 'settle$', align: 'center',title: '状态', templet: '#settleTpl',  minWidth: 160, width: 160}
            // ,{field: 'status$', align: 'center',title: '状态'}

 src/main/webapp/static/js/report/workCountIn.js

@@ -2,7 +2,7 @@
function getCol() {
    var cols = [
        {field: 'oneday', align: 'center', title: '入库日期', width: 200}
        ,{field: 'matnr', align: 'center',title: '单据号'}
        ,{field: 'matnr', align: 'center',title: '物料号'}
        ,{field: 'maktx', align: 'center',title: '物料号'}
        ,{field: 'anfme', align: 'center',title: '数量'}
    ];

 src/main/webapp/static/js/report/workCountOut.js

@@ -2,7 +2,7 @@
function getCol() {
    var cols = [
        {field: 'oneday', align: 'center', title: '入库日期', width: 200}
        ,{field: 'matnr', align: 'center',title: '单据号'}
        ,{field: 'matnr', align: 'center',title: '物料号'}
        ,{field: 'maktx', align: 'center',title: '物料号'}
        ,{field: 'anfme', align: 'center',title: '数量'}
    ];

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

@@ -26,7 +26,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="物料号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">

 src/main/webapp/views/locDetlStatis/locDetlStatis.html

@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="物料号" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->

 src/main/webapp/views/mat/mat.html

@@ -86,7 +86,7 @@
                    <!-- 表格工具栏2 -->
                    <div id="search-box" class="layui-form toolbar"  style="padding-top: 5px">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">单据号:</label>
                            <label class="layui-form-label" style="padding: 8px 15px 8px 15px">物料号:</label>
                            <div class="layui-input-inline">
                                <input name="matnr" class="layui-input" placeholder="输入商品编号"/>
                            </div>
@@ -228,7 +228,7 @@

            <div class="layui-col-md6">
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">单据号</label>
                    <label class="layui-form-label layui-form-required">物料号</label>
                    <div class="layui-input-block">
                        <input id="matnr" name="matnr" placeholder="请输入单据号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
@@ -290,7 +290,7 @@
                <div id="template-preview-1" class="template-preview" style="display: inline-block">
                    <table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
                        <tr style="height: 74px">
                            <td colspan="3" align="center" scope="col">单据号</td>
                            <td colspan="3" align="center" scope="col">物料号</td>
                            <td class="barcode" colspan="9" align="center" scope="col">
                                <img class="template-code template-barcode" src="" width="90%;">
                                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
@@ -369,7 +369,7 @@
    {{#each data}}
    <table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
        <tr style="height: 74px">
            <td align="center" colspan="3" scope="col">单据号</td>
            <td align="center" colspan="3" scope="col">物料号</td>
            <td align="center" class="barcode" colspan="9" scope="col">
                <img class="template-code" src="{{this.barcodeUrl}}" width="90%">
                <div style="letter-spacing: 2px;margin-top: 1px; text-align: center">

 src/main/webapp/views/order/order.html

@@ -261,7 +261,7 @@
                            <thead>
                            <tr style="background: none">
                                <td>No.</td>
                                <td>单据号</td>
                                <td>物料号</td>
                                <td>数量</td>
                            </tr>
                            </thead>

 src/main/webapp/views/order/out.html

@@ -98,9 +98,9 @@
                    <form class="layui-form toolbar">
                        <div class="layui-form-item">
                            <div class="layui-inline">
                                <label class="layui-form-label">单据号:</label>
                                <label class="layui-form-label">物料号:</label>
                                <div class="layui-input-inline">
                                    <input name="matnr" class="layui-input" placeholder="单据号"/>
                                    <input name="matnr" class="layui-input" placeholder="物料号"/>
                                </div>
                            </div>
                            <div class="layui-inline">

 src/main/webapp/views/orderDetl/orderDetl.html

@@ -82,7 +82,7 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">单据号: </label>
                    <label class="layui-form-label">物料号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入商品编码">
                    </div>

 src/main/webapp/views/pack/pack.html

@@ -97,7 +97,7 @@
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">单据号: </label>
                    <label class="layui-form-label">物料号: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="matnr" placeholder="请输入商品编号">
                    </div>

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

@@ -53,7 +53,7 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="matnr" placeholder="单据号"  autocomplete="off">
                <input class="layui-input" type="text" name="matnr" placeholder="物料号"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">

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

@@ -53,7 +53,7 @@
        </div>
        <div class="layui-inline">
            <div class="layui-input-inline">
                <input class="layui-input" type="text" name="matnr" placeholder="单据号"  autocomplete="off">
                <input class="layui-input" type="text" name="matnr" placeholder="物料号"  autocomplete="off">
            </div>
        </div>
        <div class="layui-inline">

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

@@ -30,7 +30,7 @@
        <div id="search-box" class="layui-form layui-card-header">
            <div class="layui-inline">
                <div class="layui-input-inline">
                    <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
                    <input class="layui-input" type="text" name="matnr" placeholder="物料号" autocomplete="off">
                </div>
            </div>
            <div class="layui-inline">

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

@@ -55,7 +55,7 @@
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '数量', style:'color: blue', width:50},
                {field: 'matnr', align: 'center', title: '单据号'},
                {field: 'matnr', align: 'center', title: '物料号'},
                {field: 'maktx', align: 'center', title: '物料号'}
            ]],
            done: function (res, curr, count) {

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

@@ -79,7 +79,7 @@
        <input id="locNo" type="text" disabled="disabled">
    </div>
    <div class="form-item">
        <span>单据号</span>
        <span>物料号</span>
        <input id="matnr" type="text" disabled="disabled">
    </div>
    <div class="form-item">

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

@@ -77,7 +77,7 @@

<div class="form-box">
    <div class="form-item">
        <span>单据号</span>
        <span>物料号</span>
        <input id="matNo" type="text" placeholder="扫码 / 输入" onkeyup="find(this)" autocomplete="off">
    </div>
    <div class="form-item">

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

@@ -120,7 +120,7 @@
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '数量', style:'color: blue', width:50},
                {field: 'matnr', align: 'center', title: '单据号'},
                {field: 'matnr', align: 'center', title: '物料号'},
                {field: 'maktx', align: 'center', title: '物料号'}
            ]],
            done: function (res, curr, count) {

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

@@ -20,7 +20,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="物料号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

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

@@ -21,7 +21,7 @@
<div id="search-box" class="layui-form layui-card-header">
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="物料号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

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

@@ -26,7 +26,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="物料号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

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

@@ -26,7 +26,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="物料号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline" style="width: 300px">

 src/main/webapp/views/waitPakin/waitPakin.html

@@ -21,7 +21,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="matnr" placeholder="单据号" autocomplete="off">
            <input class="layui-input" type="text" name="matnr" placeholder="物料号" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->

 src/main/webapp/views/waitPakin/waitPakin_detail.html

@@ -36,7 +36,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">单据号：</label>
            <label class="layui-form-label">物料号：</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text">
            </div>

 src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html

@@ -42,7 +42,7 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">单据号：</label>
            <label class="layui-form-label">物料号：</label>
            <div class="layui-input-inline">
                <input id="matnr" class="layui-input" type="text">
            </div>