From 089775b8956ae5ecc65b49ab1859f36ca76678d8 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期六, 27 一月 2024 08:31:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2 +- src/main/java/com/zy/asrs/controller/SiteController.java | 6 +++--- src/main/java/com/zy/asrs/entity/BasDevp.java | 4 ++-- src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++++ src/main/java/com/zy/asrs/entity/LocMast.java | 4 ++-- src/main/java/com/zy/common/model/LocTypeDto.java | 6 +++--- src/main/java/com/zy/common/service/CommonService.java | 4 ++-- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java index 910788e..a8f376d 100644 --- a/src/main/java/com/zy/asrs/controller/SiteController.java +++ b/src/main/java/com/zy/asrs/controller/SiteController.java @@ -84,8 +84,8 @@ vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 鍏ュ簱鏍囪 vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿 vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔� -// vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅 - vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�"); + vo.setLocType1(staProtocol.isWeight() ? "閲�" : "杞�"); //楂樹綆搴撲綅 +// vo.setLocType1(devp.getDevNo() == 102 ? "楂�" : "浣�"); } return R.ok().add(list); } @@ -160,7 +160,7 @@ vo.setPakMk(staProtocol.isPakMk() ? "Y" : "N"); // 闇�姹�1 vo.setEmptyMk(staProtocol.isEmptyMk() ? "Y" : "N"); // 绌烘澘淇″彿 vo.setStaNo(staProtocol.getStaNo()); // 鐩爣绔� - vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() && staProtocol.isLow() ? "浣�" : "楂�"); //楂樹綆搴撲綅 + vo.setLocType1(staProtocol.isWeight() ? "閲�" : "杞�"); return R.ok().add(vo); } } diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java index 1e3d022..13e8cf4 100644 --- a/src/main/java/com/zy/asrs/entity/BasDevp.java +++ b/src/main/java/com/zy/asrs/entity/BasDevp.java @@ -228,9 +228,9 @@ case 0: return "鏈煡"; case 1: - return "浣庡簱浣�"; + return "閲嶅簱浣�"; case 2: - return "楂樺簱浣�"; + return "杞诲簱浣�"; default: return String.valueOf(this.locType1); } diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java index cd931b9..58506af 100644 --- a/src/main/java/com/zy/asrs/entity/LocMast.java +++ b/src/main/java/com/zy/asrs/entity/LocMast.java @@ -194,9 +194,9 @@ case 0: return "鏈煡"; case 1: - return "浣庡簱浣�"; + return "閲嶅簱浣�"; case 2: - return "楂樺簱浣�"; + return "杞诲簱浣�"; default: return String.valueOf(this.locType1); } diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index b28f535..6c99c05 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java @@ -206,6 +206,12 @@ if (!Cools.isEmpty(checkPick)) { continue; } +// WrkMast checkPick2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>() +// .eq("barcode", barcode) +// .in("io_type", 57,53)); +// if (!Cools.isEmpty(checkPick2)) { +// continue; +// } try { diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java index 6e4ccff..f6d344d 100644 --- a/src/main/java/com/zy/common/model/LocTypeDto.java +++ b/src/main/java/com/zy/common/model/LocTypeDto.java @@ -29,10 +29,10 @@ } public LocTypeDto(StaProtocol staProtocol) { - if (!staProtocol.isWeight()) { - this.locType1 = 1; // 杞昏揣 + if (staProtocol.isWeight()) { + this.locType1 = 1; // 閲嶈揣 } else { - this.locType1 = 2; // 閲嶈揣 + this.locType1 = 2; // 杞昏揣 } } diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index fa0d583..a654ccd 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -298,8 +298,8 @@ } // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠� - if (locTypeDto.getLocType1() == 1) { - locTypeDto.setLocType1((short) 2); + if (locTypeDto.getLocType1() == 2) { + locTypeDto.setLocType1((short) 1); return getLocNo(null, staDescId, sourceStaNo, matNos, locTypeDto, times); } News.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times); diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java index ccc3096..4bcaf36 100644 --- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java @@ -94,7 +94,7 @@ basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿 basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿 basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿 - basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2); + basDevp.setLocType1(weight ? (short) 1 : (short) 2); basDevp.setInQty(inQty !=null ?(int)inQty : 0); return basDevp; } -- Gitblit v1.9.1