1

zhang

8 天以前 9455c3adbfcc91166f805371f8009446a230bcde

1

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

@@ -387,9 +387,9 @@
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
                return "合格";
            case 0:
                return "否";
                return "不合格";
            default:
                return String.valueOf(this.inspect);
        }

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

@@ -387,9 +387,7 @@
                //for (CombParam.CombMat elem : param.getCombMats()) {
                CombParam.CombMat elem = combMats.get(i);
                CodeDataParam codeDataParam = data.get(i);
                if (!codeDataParam.getQuality().equals(order.getShipCode())) {
                    throw new CoolException("单据质量状态和组托物料不匹配");
                }

                elem.setTemp1(codeDataParam.getQuality());
                elem.setAnfme(codeDataParam.getQty());
                //elem.setBatch(codeDataParam.getBatchNum());
@@ -403,6 +401,9 @@
                if (Cools.isEmpty(orderDetl)) {
                    throw new CoolException("该单据中未找到对应物料明细");
                }
                if (!codeDataParam.getQuality().equals(orderDetl.getInspect())) {
                    throw new CoolException("单据质量状态和组托物料不匹配");
                }
                if (elem.getAnfme() > orderDetl.getEnableQty()) {
                    throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
                }

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

@@ -119,7 +119,7 @@
                now,    // 修改时间
                null    // 备注
        );
        order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
        //order.setShipCode(String.valueOf(param.getDetails().get(0).getQuality()));
        if (!orderService.insert(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");
        }
@@ -129,6 +129,7 @@
        for (DetlDto detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getFromOrderNo()
                    , detail.getMark(),detail.getCustomer(),detail.getSuppName(),detail.getTemp1(),detail.getTemp2(),detail.getTemp3(),detail.getTemp4());
            dto.setQuality(detail.getQuality());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
@@ -164,6 +165,7 @@
            orderDetl.setTemp2(detlDto.getTemp2());
            orderDetl.setTemp3(detlDto.getTemp3());
            orderDetl.setTemp4(detlDto.getTemp4());
            orderDetl.setInspect(detlDto.getQuality());
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }