From aecd3f3e4e63770d2e23d1db2b63ab47d6dee5f1 Mon Sep 17 00:00:00 2001 From: 18516761980 <tqsxp@163.com> Date: 星期五, 30 九月 2022 14:27:19 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/param/CombParam.java | 2 +- src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 ++++++------ src/main/java/com/zy/asrs/task/handler/StandingHandler.java | 2 +- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 8 ++++---- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 +++--- src/main/resources/application.yml | 7 ++++--- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java index 91a68e3..7c16356 100644 --- a/src/main/java/com/zy/asrs/entity/param/CombParam.java +++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java @@ -31,7 +31,7 @@ private String barcode; // 搴撲綅缂栧彿 - private String locno; + private String locNo; private List<CombMat> combMats; diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java index 04e0c31..a2849a6 100644 --- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java @@ -213,10 +213,10 @@ @Override public void onSale(CombParam param) { // 鑾峰彇搴撲綅鍙� - String locno = param.getLocno(); - Node node = nodeService.selectByUuid(locno); + String locNo = param.getLocNo(); + Node node = nodeService.selectByUuid(locNo); if (Cools.isEmpty(node)) { - throw new CoolException(param.getLocno() + ":搴撲綅涓嶅瓨鍦�"); + throw new CoolException(param.getLocNo() + ":搴撲綅涓嶅瓨鍦�"); } // 鑾峰彇鍟嗗搧鍒楄〃 @@ -232,7 +232,7 @@ throw new CoolException(combMat.getMatnr() + ":鍟嗗搧鎵瑰彿鏈夎锛�"); } ManLocDetl manLocDetl = new ManLocDetl(); - manLocDetl.setLocNo(locno); + manLocDetl.setLocNo(locNo); manLocDetl.setNodeId(node.getId()); manLocDetl.setMatnr(combMat.getMatnr()); manLocDetl.setBatch(combMat.getBatch()); @@ -644,7 +644,7 @@ CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); - combParam.setLocno(locMast.getLocNo()); + combParam.setLocNo(locMast.getLocNo()); combParam.setPackSts(1); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); @@ -667,7 +667,7 @@ CombParam combParam = new CombParam(); combParam.setPackNo(testMast.getLocNo()); combParam.setPackName(testMast.getUserId()); - combParam.setLocno(testMast.getBarcode()); + combParam.setLocNo(testMast.getBarcode()); combParam.setRequestTime(DateUtils.convert(new Date())); return postMesData(startUpTestPACK,combParam); }catch (Exception e) { diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 4ff8547..b496292 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -703,7 +703,7 @@ locMast.setPackStatus(5); //5:闈欑疆瀹屾垚 CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); - combParam.setLocno(locMast.getLocNo()); + combParam.setLocNo(locMast.getLocNo()); combParam.setPackSts(6); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); @@ -745,7 +745,7 @@ locMast.setPackStatus(2); CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); - combParam.setLocno(locMast.getLocNo()); + combParam.setLocNo(locMast.getLocNo()); combParam.setPackSts(2); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); @@ -790,7 +790,7 @@ testMast.setModiTime(date); CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); - combParam.setLocno(locMast.getLocNo()); + combParam.setLocNo(locMast.getLocNo()); combParam.setPackSts(3); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); diff --git a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java index a52f13c..49b91c7 100644 --- a/src/main/java/com/zy/asrs/task/handler/StandingHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/StandingHandler.java @@ -119,7 +119,7 @@ CombParam combParam = new CombParam(); combParam.setPackNo(locMast.getBarcode()); - combParam.setLocno(locMast.getLocNo()); + combParam.setLocNo(locMast.getLocNo()); combParam.setPackSts(6); combParam.setRequestTime(DateUtils.convert(new Date())); postMesData(inpath,combParam); diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java index 1e9a3b9..2303def 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -65,8 +65,8 @@ if(wrkDetl != null){ CombParam combParam = new CombParam(); combParam.setPackNo(wrkDetl.getZpallet()); - combParam.setPackName(wrkDetl.getMatnr()); - combParam.setLocno(wrkMast.getLocNo()); +// combParam.setPackName(wrkDetl.getMatnr()); + combParam.setLocNo(wrkMast.getLocNo()); combParam.setPackSts(1); combParam.setRequestTime(DateUtils.convert(new Date())); result = postMesData(inpath,combParam); @@ -84,7 +84,7 @@ CombParam combParam = new CombParam(); combParam.setPackNo(wrkDetl.getZpallet()); combParam.setPackName(wrkDetl.getMatnr()); - combParam.setLocno(wrkMast.getLocNo()); + combParam.setLocNo(wrkMast.getLocNo()); combParam.setPackSts(0); combParam.setRequestTime(DateUtils.convert(new Date())); result = postMesData(outPath,combParam); @@ -93,7 +93,7 @@ if(wrkDetl != null){ CombParam combParam = new CombParam(); combParam.setPackNo(wrkDetl.getZpallet()); - combParam.setLocno(wrkMast.getLocNo()); + combParam.setLocNo(wrkMast.getLocNo()); combParam.setPackSts(5); combParam.setRequestTime(DateUtils.convert(new Date())); result = postMesData(inpath,combParam); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8d8f9ec..1af461d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -53,11 +53,12 @@ groupCount: 2 mes: - url: 127.0.0.1:8080/test + url: 172.28.15.251:7899 + url2: 172.28.15.251:7899 # 鍏ュ簱涓婃姤 - inPath: 172.28.15.251:7899/mes-pm/in/stock/condition/warehousing + inPath: mes-pm/in/stock/condition/warehousing # 鍑哄簱涓婃姤 - outPath: 172.28.15.251:7899/mes-pm/in/stock/condition/exWarehouse + outPath: mes-pm/in/stock/condition/exWarehouse # 鍚姩娴嬭瘯璇锋眰 startUpTestPACK: 127.0.0.1:8080/ynwms/open/asrs/rpv/test/open/auth #鏆傚仠娴嬭瘯 -- Gitblit v1.9.1