From 414f272bac3f455d23a0da75cc7a308b95d23567 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期二, 14 二月 2023 10:43:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 3 src/main/webapp/static/js/common.js | 2 pom.xml | 2 src/main/java/com/zy/common/service/CommonService.java | 114 ++++++++------------------------------ src/main/resources/application.yml | 2 5 files changed, 28 insertions(+), 95 deletions(-) diff --git a/pom.xml b/pom.xml index 9da0a81..4cc2d08 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ </dependencies> <build> - <finalName>ynwms</finalName> + <finalName>szfzwms</finalName> <plugins> <plugin> <groupId>org.springframework.boot</groupId> diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 1e48dab..8b9b04d 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -28,12 +28,10 @@ public class CommonService { public static final List<Integer> FIRST_GROUP_ROW_LIST = new ArrayList<Integer>() {{ - add(2);add(3);add(4);add(5);add(6);add(7);add(8);add(9);add(10); - add(11);add(12);add(13);add(14);add(15);add(16);add(17); + add(1);add(2);add(3);add(4); }}; public static final List<Integer> SECOND_GROUP_ROW_LIST = new ArrayList<Integer>() {{ - add(18);add(19);add(20); - add(21);add(22);add(23);add(24);add(25);add(26);add(27);add(28);add(29);add(30); + add(5);add(6);add(7);add(8);add(9);add(10);add(11); }}; @Autowired @@ -110,23 +108,7 @@ */ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) { StartupDto startupDto = new StartupDto(); - int start = 2; - int end = 30; - int dualCrnNo; - switch (sourceStaNo) { - case 203: - whsType = 1; - dualCrnNo = 2; - break; - case 102: - whsType = 2; - start = 31; - end = 32; - dualCrnNo = 3; - break; - default: - throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�"); - } + whsType = 1; // 鐢熸垚宸ヤ綔鍙� int workNo = getWorkNo(0); RowLastno rowLastno = rowLastnoService.selectById(whsType); @@ -137,13 +119,7 @@ int sRow = rowLastno.getsRow(); // 璧峰鍒� int eRow = rowLastno.geteRow(); // 缁堟鍒� int crn_qty = rowLastno.getCrnQty(); // 鍫嗗灈鏈烘暟閲忥紙宸烽亾鏁伴噺锛� - int rowCount; - if (whsType == 1) { - rowCount = 2; - } else { - rowCount = 1; - } -// int rowCount = eRow - sRow + 1; // 搴撴帓鎬绘暟 + int rowCount = eRow - sRow + 1; // 搴撴帓鎬绘暟 // 鐩爣鍫嗗灈鏈哄彿 int crnNo = 0; // 鐩爣搴撲綅 @@ -151,38 +127,17 @@ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� if (!Cools.isEmpty(matNos) && matNos.size() == 1) { - List<String> locNos = locDetlService.getSameDetl(matNos.get(0), start, end); + List<String> locNos = locDetlService.getSameDetl(matNos.get(0), sRow, eRow); for (String locNo : locNos) { - if (whsType == 1) { - LocMast locMast0 = locMastService.findOutMost(locNo); - if (null != locMast0) { - // 娴呭簱浣嶇鍚堝昂瀵告娴� - if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) { - // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父 - if (basCrnpService.checkSiteError(dualCrnNo, true)) { - crnNo = dualCrnNo; - locMast = locMast0; - break; - } - } - } - } else { - if (Utils.isShallowLoc(slaveProperties, locNo)) { - continue; - } - String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo); - // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� - LocMast shallowLoc = locMastService.selectById(shallowLocNo); - if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { - if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) { - // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� - if (locMastService.checkEmptyCount(shallowLoc)) { - if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { - locMast = shallowLoc; - crnNo = locMast.getCrnNo(); - break; - } - } + LocMast locMast0 = locMastService.findOutMost(locNo); + if (null != locMast0) { + // 娴呭簱浣嶇鍚堝昂瀵告娴� + if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) { + // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父 + if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { + crnNo = locMast0.getCrnNo(); + locMast = locMast0; + break; } } } @@ -192,39 +147,18 @@ // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 if (staDescId == 10) { List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("loc_sts", "D").ge("row1", start).le("row1", end)); + .eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow)); if (locMasts.size() > 0) { for (LocMast loc : locMasts) { - if (whsType == 1) { - LocMast locMast0 = locMastService.findOutMost(loc.getLocNo()); - if (null != locMast0) { - // 娴呭簱浣嶇鍚堝昂瀵告娴� - if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) { - // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父 - if (basCrnpService.checkSiteError(dualCrnNo, true)) { - crnNo = dualCrnNo; - locMast = locMast0; - break; - } - } - } - } else { - if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) { - continue; - } - String shallowLocNo = Utils.getShallowLoc(slaveProperties, loc.getLocNo()); - // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣� - LocMast shallowLoc = locMastService.selectById(shallowLocNo); - if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) { - if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) { - // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣� - if (locMastService.checkEmptyCount(shallowLoc)) { - if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) { - locMast = shallowLoc; - crnNo = locMast.getCrnNo(); - break; - } - } + LocMast locMast0 = locMastService.findOutMost(loc.getLocNo()); + if (null != locMast0) { + // 娴呭簱浣嶇鍚堝昂瀵告娴� + if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) { + // 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父 + if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) { + crnNo = locMast0.getCrnNo(); + locMast = locMast0; + break; } } } diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java index f76f630..c09b5b8 100644 --- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java +++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java @@ -16,7 +16,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import java.util.Date; @@ -29,7 +28,7 @@ * Created by vincent on 2020/11/27 */ @Slf4j -@Component +//@Component public class ErpScheduler extends AbstractHandler<Exception> { @Autowired diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 8f99821..e4fa61e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -11,7 +11,7 @@ datasource: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver # url: jdbc:sqlserver://47.97.1.152:51433;databasename=ynasrs - url: jdbc:sqlserver://localhost:1433;databasename=ynasrs + url: jdbc:sqlserver://192.168.4.15:1433;databasename=szfzasrs username: sa # password: Zoneyung@zy56$ password: sa@123 diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js index 945ee0f..0ac8fcc 100644 --- a/src/main/webapp/static/js/common.js +++ b/src/main/webapp/static/js/common.js @@ -1,4 +1,4 @@ -var baseUrl = "/ynwms"; +var baseUrl = "/szfzwms"; // 璇︽儏绐楀彛-楂樺害 var detailHeight = '80%'; -- Gitblit v1.9.1