ERP对接

bfwms

11 小时以前 aefc453a2a9bfcc654bcc7a2ce4735243119665e

ERP对接

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

@@ -164,10 +164,10 @@
     */
    @PostMapping("/order/pakout/new/default/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(
            @RequestBody HashMap<String , Object> map
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
            @RequestBody HashMap<String , Object> map, HttpServletRequest request
            ) {
//        auth(appkey, param, request);
        auth(appkey, map, request);
        String toJSONString = JSONObject.toJSONString(map.get("data"));
        List<OpenOrderPakoutParam> openOrderPakoutParams=JSON.parseArray(toJSONString,OpenOrderPakoutParam.class);
        int i=1;
@@ -198,10 +198,10 @@
     */
    @PostMapping("/pickToFill/barcode")
    @AppAuth(memo = "捡料转全板")
    public synchronized R againOut(@RequestHeader(required = false) String appkey,
                                            @RequestBody PackParam param,
                                            HttpServletRequest request) {
//        auth(appkey, param, request);
    public synchronized R againOut(@RequestHeader(required = false) String appkey,@RequestBody HashMap<String , Object> map, HttpServletRequest request) {
        auth(appkey, map, request);
        String toJSONString = JSONObject.toJSONString(map);
        PackParam param=JSON.parseObject(toJSONString,PackParam.class);
        if (Cools.isEmpty(param)||Cools.isEmpty(param.getBarcode())) {
            return R.error("托盘码为空,请检查");
        }

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

@@ -300,10 +300,10 @@
            boolean boo= true;
            for(WrkDetl wrkDetl : wrkDetls) {
                if(wrkDetl.getMatnr().equals(locDetl.getMatnr())&&wrkDetl.getBatch().equals(locDetl.getBatch())) {
                    v = locDetl.getAnfme() - wrkDetl.getAnfme();
                    if(v == 0){
                        boo = false;
                    }
                    wrkDetl.setAnfme(locDetl.getAnfme());
                    wrkDetlService.updateAnfme(locDetl.getAnfme(),wrkMast.getWrkNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
                    boo=false;
                    break;
                }
            }
            if(boo){

 src/main/java/com/zy/asrs/task/ERPReportScheduler.java

@@ -135,6 +135,7 @@
                            }else{
                                wrkMast.setWrkSts(18L);//出库转历史档
                            }
                            success = true;
                            wrkMastService.updateById(wrkMast);
                        } else {
                            log.error("任务号={}，上报失败",wrkMast.getWrkNo());