自动化立体仓库 - WMS系统
zjj
2023-09-15 82f825105d954770c0e6176e2f9248b40ba90f8e
#盘点+批次
5个文件已修改
13 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OrderCheckController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/param/ExamineParam.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/orderCheck/orderCheck.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OrderCheckController.java
@@ -149,6 +149,7 @@
        orderCheck.setDocType(16L);
        orderCheck.setCreateTime(now);
        orderCheck.setUpdateTime(now);
        if (!orderCheckService.insert(orderCheck)) {
            throw new CoolException("保存盘点单主档失败");
        }
@@ -167,6 +168,7 @@
            locCheck.setCreateTime(now);
            locCheck.setUpdateTime(now);
            locCheck.setOrderNo(param.getOrderNo());
            locCheck.setBatch(manLocDetl.getBatch());
            if (!locCheckService.insert(locCheck)){
                return R.error("插入失败");
            }
src/main/java/com/zy/asrs/entity/param/ExamineParam.java
@@ -20,6 +20,7 @@
        private String matnr;
        private String maktx;
        private Double realAnfme;
        private String batch;
    }
}
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -905,7 +905,8 @@
            EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
            wrapper.eq("order_no", combParam.getOrderNo())
                    .eq("matnr", detl.getMatnr())
                    .eq("loc_no", detl.getLocNo());
                    .eq("loc_no", detl.getLocNo())
                    .eq("batch",detl.getBatch());
            LocCheck CheckDetl = locCheckService.selectOne(wrapper);
            if (CheckDetl == null){
                Date now = new Date();
src/main/java/com/zy/asrs/service/impl/OrderCheckServiceImpl.java
@@ -195,7 +195,8 @@
     for (ExamineParam.data list:param.getList()){
         EntityWrapper<ManLocDetl> wrapper = new EntityWrapper<>();
         wrapper.eq("matnr", list.getMatnr())
                 .eq("loc_no", list.getLocNo());
                 .eq("loc_no", list.getLocNo())
                 .eq("batch", list.getBatch());
         ManLocDetl manLocDetl = manLocDetlService.selectOne(wrapper);
         if (manLocDetl == null){
@@ -215,6 +216,7 @@
             manLocDetl1.setModiTime(now);
             manLocDetl1.setOrderNo(list.getOrderNo());
             manLocDetl1.setStockFreeze(1);
             manLocDetl1.setBatch(list.getBatch());
             if (!manLocDetlService.insert(manLocDetl1)){
                 return R.error("插入数据失败");
src/main/webapp/static/js/orderCheck/orderCheck.js
@@ -133,8 +133,9 @@
                        cols: [[   //工具条明细
                            {type: 'numbers'},
                            {field: 'matnr', title: '商品编码', width: 160},
                            {field: 'maktx', title: '商品名称', width: 160},
                            {field: 'maktx', title: '商品名称'},
                            {field: 'locNo', title: '库位号'},
                            {field: 'batch', title: '批次'},
                            {field: 'anfme', title: '数量'},
                            {field: 'realAnfme', title: '真实数量',style: 'color: blue;font-weight: bold', edit: true},
                            {field: 'diffAnfme', title: '差异数量', style: 'font-weight: bold'},