对接

zhang

13 小时以前 1236197ab939a618b82b9e9ea6fddf94b8740b58

对接

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

@@ -279,6 +279,7 @@
    @RequestMapping("/comb/auth")
    @ManagerAuth(memo = "组托")
    public R comb(@RequestBody CombParam combParam){
        log.info("组托："+JSONObject.toJSONString(combParam));
        if (Cools.isEmpty(combParam.getBarcode(), combParam.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }

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

@@ -400,7 +400,10 @@
                // 订单明细数量校验
                OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
                if (Cools.isEmpty(orderDetl)) {
                    throw new CoolException("该单据中未找到对应物料明细");
                     orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), null);
                    if (Cools.isEmpty(orderDetl)){
                        throw new CoolException("该单据中未找到对应物料明细");
                    }
                }
                if (Cools.isEmpty(codeDataParam.getQuality())) {
                    throw new CoolException("条码未返回质量状态");

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

@@ -80,7 +80,12 @@
            boolean orderNo1 = orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_no", param.getOrderNo()));

        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        DocType docType;
        if (param.getOrderType().equals("调拨单")){
             docType = docTypeService.selectOrAdd("调拨单(入)", Boolean.TRUE);
        }else {
             docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.TRUE);
        }
        Date now = new Date();
        // 单据主档
        order = new Order(
@@ -231,7 +236,12 @@
            }
            orderService.remove(order.getId());
        }
        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        DocType docType;
        if (param.getOrderType().equals("调拨单")){
            docType = docTypeService.selectOrAdd("调拨单(出)", Boolean.FALSE);
        }else {
            docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        }
        Date now = new Date();
        // 单据主档
        order = new Order(

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -53,7 +53,7 @@
    </resultMap>

    <select id="selectItem" resultMap="BaseResultMap">
        select * from man_order_detl
        select top 1 * from man_order_detl
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}