自动化立体仓库 - WMS系统
zc
7 天以前 b8f03bd597383b31b970e198cc707b40bfab1c02
完善erp对接
8个文件已修改
35 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OutController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LocDetlMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/OrderMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/common.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/locDetl/locDetl.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OutController.java
@@ -133,7 +133,7 @@
        // 获取可用库存记录
        List<LocDetl> stocks = locDetlService.queryStock(
            orderDetl.getMatnr(), orderDetl.getBatch(), null,
            orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getSuppCode(),
            processedLocs, orderDetl.getSupp(),
            orderDetl.getTemp1(), orderDetl.getTemp2()
        );
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -331,7 +331,7 @@
                if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                        eq("zpallet", param.getBarcode())
                        .eq("io_status", "N")
                        .eq("matnr", elem.getMatnr()).eq("three_code",elem.getThreeCode()).eq("batch", elem.getBatch())) > 0) {
                        .eq("matnr", elem.getMatnr()).eq("three_code", elem.getThreeCode()).eq("batch", elem.getBatch())) > 0) {
                    throw new CoolException(param.getBarcode() + "已有相同数据");
                }
@@ -401,10 +401,10 @@
                if (Cools.isEmpty(orderDetl)) {
                    throw new CoolException("该单据中未找到对应物料明细");
                }
                if (Cools.isEmpty(codeDataParam.getQuality())){
                if (Cools.isEmpty(codeDataParam.getQuality())) {
                    throw new CoolException("条码未返回质量状态");
                }
                if (!codeDataParam.getQuality().equals(orderDetl.getInspect())) {
                if (Integer.parseInt(codeDataParam.getQuality()) != orderDetl.getInspect()) {
                    throw new CoolException("单据质量状态和组托物料不匹配");
                }
                if (elem.getAnfme() > orderDetl.getEnableQty()) {
@@ -421,7 +421,7 @@
                detlDto.setTemp1(codeDataParam.getQuality());
                detlDto.setFromOrderNo(codeDataParam.getBarcode());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getFromOrderNo());
                    DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(), detlDto.getFromOrderNo());
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                } else {
src/main/java/com/zy/asrs/task/handler/OrderMoveHistoryHandler.java
@@ -38,7 +38,7 @@
            List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
                    .eq("order_no", order.getOrderNo()));
            moveBoth(order,orderDetls);
            List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("orderNo", order.getOrderNo()));
            List<OrderDetlReport> orderNo = orderDetlReportService.selectList(new EntityWrapper<OrderDetlReport>().eq("order_no", order.getOrderNo()));
            for (OrderDetlReport orderDetlReport : orderNo){
                OrderDetlReportLog log = new OrderDetlReportLog();
                log.sync(orderDetlReport);
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -120,7 +120,7 @@
            }
        }
        // 出库完成上报
//        if (docType.getPakout() == 1) {
        if (docType.getPakout() == 1) {
//            MesPakoutParam pakoutParam = new MesPakoutParam();
//            pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("手动出库单"));
//            pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
@@ -147,9 +147,9 @@
//                if (jsonObject.getInteger("code").equals(200)) {
//                    success = true;
//                    // 修改订单状态 4.完成 ===>> 6.已上报
//                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
//                        throw new CoolException("服务器内部错误,请联系管理员");
//                    }
            if (!orderService.updateSettle(order.getId(), 6L, null)) {
                throw new CoolException("服务器内部错误,请联系管理员");
            }
//                } else {
//                    log.error("请求接口失败!!!url:{};request:{};response:{}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
//                    throw new CoolException("上报mes系统失败");
@@ -172,7 +172,7 @@
//                    );
//                } catch (Exception e) { log.error("", e); }
//            }
//        }
        }
        return SUCCESS;
    }
src/main/resources/mapper/LocDetlMapper.xml
@@ -245,8 +245,9 @@
        </if>
        order by
        DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
        desc,
        sku,
        <!-- DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
        desc, -->
        NEWID(),
        case
        when (left(a.loc_no, 2) = '01') then 0
src/main/resources/mapper/OrderMapper.xml
@@ -55,7 +55,7 @@
    </update>
    <select id="selectComplete" resultMap="BaseResultMap">
        select top 5 *
        select top 10 *
        from man_order
        where 1=1
        and settle = 4
src/main/webapp/static/js/common.js
@@ -233,6 +233,6 @@
    ,{field: 'unit', align: 'center',title: '单位', hide: true}
    ,{field: 'barcode', align: 'center',title: '条码', hide: true}
    ,{field: 'supp', align: 'center',title: '供应商', hide: true}
    ,{field: 'suppCode', align: 'center',title: '来源单号', hide: true}
    // ,{field: 'suppCode', align: 'center',title: '来源单号', hide: true}
]
src/main/webapp/static/js/locDetl/locDetl.js
@@ -5,7 +5,7 @@
        ,{field: 'storeDate', 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: true}
        ,{field: 'orderNo', align: 'center',title: '单据编号'}
        ,{field: 'sku', align: 'center',title: '批号'}
        //,{field: 'batch', align: 'center',title: '批号', width: 300, sort:true}
        ,{field: 'anfme', align: 'center',title: '数量'}
@@ -15,7 +15,7 @@
        ,{field: 'barcode', align: 'center',title: '条码', hide: true}
        ,{field: 'supp', align: 'center',title: '供应商', hide: false}
        ,{field: 'sku', align: 'center',title: '批号'}
        ,{field: 'suppCode', align: 'center',title: '来源单号', hide: false}
        // ,{field: 'suppCode', align: 'center',title: '来源单号', hide: false}
    ];