#

Administrator

2 天以前 c11645d9d082306e7ac2c7d7b23cfcc3e9a9c1c2

#

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

@@ -87,8 +87,8 @@
                            if (issued <= 0.0D) {
                                continue;
                            }
                            List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, detl.getMatnr(), detl.getBatch(),
                                    detl.getBrand(), detl.getStandby1(), detl.getStandby2(), detl.getStandby3(), detl.getBoxType1(), detl.getBoxType2(), detl.getBoxType3());
                            List<LocDetl> locDetls = locDetlService.queryStockAll(null, exist, detl.getMatnr(), detl.getBatch() != ""?detl.getBatch():"R002",
                                    detl.getBrand(), detl.getStandby1(), detl.getStandby2(), detl.getStandby3(), detl.getBoxType1() !=""?detl.getBoxType1():"R002", detl.getBoxType2(), detl.getBoxType3());
                            for (LocDetl locDetl : locDetls) {
                                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()).eq("loc_sts", "F"));
                                if (locMast != null) {

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -102,6 +102,7 @@
                        }



                        // 保存入库通知档历史档
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
//                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
@@ -128,27 +129,36 @@

            // 出库 --------------------------------------------------------------------------------
            } else if (wrkMast.getWrkSts() == 15) {
                if(wrkMast.getExitMk().equals("Y")){
                    List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
                    WrkDetl wrkDetl = wrkDetls1.get(0);
                    Double anfmeBack = wrkDetl.getAnfme();
                    if(wrkMast.getIsSuplus().equals(0)){
                        anfmeBack = 0.0;
                    }
                    String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\",\"anfme\":" + anfmeBack + "}";
                    log.info("ERP退料上报请求: workNo={}, request={}", wrkMast.getWrkNo(), request);
                    JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),anfmeBack,"R002");
                    log.info("ERP退料上报响应: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
                    apiLogService.save("ERP退料上报", "erpTokenService.stockBack", null, null, request,
                            res == null ? null : res.toJSONString(),
                            res != null && Boolean.TRUE.equals(res.getBoolean("success")));
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet",wrkMast.getBarcode()));
                    if(!Objects.isNull(locDetl)){
                        locDetl.setBatch("R002");
                        locDetl.setBoxType1("R002");
                        locDetlService.updateById(locDetl);
                    }
                }

//                if(wrkMast.getExitMk().equals("Y")){
//                    List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));
//                    WrkDetl wrkDetl = wrkDetls1.get(0);
//                    Double anfmeBack = wrkDetl.getAnfme();
//                    if(wrkDetls1.isEmpty()){
//                        anfmeBack = 0.0;
//
//                    }
//                    if(wrkMast.getIsSuplus().equals(0)){
//                        anfmeBack = 0.0;
//                    }
//                    if(wrkDetls1.isEmpty()){
//                        anfmeBack = 0.0;
//
//                    }
//                    String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\",\"anfme\":" + anfmeBack + "{\"tlocation\":\"" + "R002" +"}";
//                    log.info("ERP退料上报请求: workNo={}, request={}", wrkMast.getWrkNo(), request);
//                    JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),anfmeBack,"R002");
//                    log.info("ERP退料上报响应: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
//                    apiLogService.save("ERP退料上报", "erpTokenService.stockBack", null, null, request,
//                            res == null ? null : res.toJSONString(),
//                            res != null && Boolean.TRUE.equals(res.getBoolean("success")));
//                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet",wrkMast.getBarcode()));
//                    if(!Objects.isNull(locDetl)){
//                        locDetl.setBatch("R002");
//                        locDetl.setBoxType1("R002");
//                        locDetlService.updateById(locDetl);
//                    }
//                }

//                else if(Objects.isNull(wrkMast.getLocNo())){
//                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",wrkMast.getLocNo()).eq("whs_type",2));
@@ -175,6 +185,35 @@
//                    }
//                }
            }
            if(wrkMast.getIoType()!=2){
                if(wrkMast.getExitMk().equals("Y") ){
                    List<WrkDetl> wrkDetls1 = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no",wrkMast.getWrkNo()));

                    WrkDetl wrkDetl =null;
                    Double anfmeBack = 0.0;
                    if(!wrkDetls1.isEmpty()){
                        wrkDetl=wrkDetls1.get(0);
                        anfmeBack = wrkDetl.getAnfme();

                    }
                    if(wrkMast.getIoType() == 10){
                        anfmeBack = 0.0001;
                    }
                    String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\",\"anfme\":" + anfmeBack + "{\"tlocation\":\"" + "R002" +"}";
                    log.info("ERP退料上报请求: workNo={}, request={}", wrkMast.getWrkNo(), request);
                    JSONObject res = erpTokenService.stockBack(wrkMast.getBarcode(),anfmeBack,"R002");
                    log.info("ERP退料上报响应: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());
                    apiLogService.save("ERP退料上报", "erpTokenService.stockBack", null, null, request,
                            res == null ? null : res.toJSONString(),
                            res != null && Boolean.TRUE.equals(res.getBoolean("success")));
                    LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("zpallet",wrkMast.getBarcode()));
                    if(!Objects.isNull(locDetl)){
                        locDetl.setBatch("R002");
                        locDetl.setBoxType1("R002");
                        locDetlService.updateById(locDetl);
                    }
                }
            }

            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -631,7 +631,7 @@
                            throw new CoolException("数据错误， 目标工位不存在！！");
                        }
                        bLocNo.setLocType(LocStsType.LOC_STS_TYPE_F.type);
                            String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "\"}";
                            String request = "{\"barcode\":\"" + wrkMast.getBarcode() + "{\"tlocation\":\"" + "W001" + "\"}";
                            log.info("ERP叫料出库上报请求: workNo={}, request={}", wrkMast.getWrkNo(), request);
                            JSONObject res = erpTokenService.stockOut(wrkMast.getBarcode(),"W001");
                            log.info("ERP叫料出库上报响应: workNo={}, response={}", wrkMast.getWrkNo(), res == null ? null : res.toJSONString());