From b29241a7d962629bde8cfef8bdc322ff882bbc20 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 三月 2024 10:31:18 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/RowLastnoMapper.xml | 5
src/main/java/com/zy/asrs/utils/Utils.java | 245 +++++++++++++++++++++++++++++++++++-----
src/main/java/com/zy/asrs/entity/RowLastno.java | 73 ++++++++++++
3 files changed, 288 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 292294b..82eafd2 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -100,6 +100,41 @@
@TableField("limint_loc")
private Integer limintLoc;
+ /**
+ * 璧峰鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "璧峰鍫嗗灈鏈哄彿")
+ @TableField("s_crn_no")
+ private Integer sCrnNo;
+
+ /**
+ * 缁堟鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "缁堟鍫嗗灈鏈哄彿")
+ @TableField("e_crn_no")
+ private Integer eCrnNo;
+
+ /**
+ * 鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
+ */
+ @ApiModelProperty(value= "鏍囪绫诲埆")
+ @TableField("sign_type")
+ private Integer signType;
+
+ /**
+ * 鏄惁鍚敤鍏跺畠鏍囪绫诲埆 0:鍏抽棴 1锛氭墦寮�
+ */
+ @ApiModelProperty(value= "鏄惁鍚敤鍏跺畠鏍囪绫诲埆")
+ @TableField("sign_type_other")
+ private Integer signTypeOther;
+
+ /**
+ * 鍏跺畠鏍囪绫诲埆锛堟槸鍚﹁緭閫佺嚎浜掗�氾級
+ */
+ @ApiModelProperty(value= "鍏跺畠鏍囪绫诲埆")
+ @TableField("sign_type_other_boolean")
+ private String signTypeOtherBoolean;
+
public RowLastno() {}
public RowLastno(String wrkMk,Integer currentRow,Integer sRow,Integer eRow,Integer crnQty,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Integer limintLoc) {
@@ -257,6 +292,44 @@
public void setLimintLoc(Integer limintLoc) {
this.limintLoc = limintLoc;
}
+ public Integer getsCrnNo() {
+ return sCrnNo;
+ }
+ public void setsCrnNo(Integer sCrnNo) {
+ this.sCrnNo = sCrnNo;
+ }
+
+ public Integer geteCrnNo() {
+ return eCrnNo;
+ }
+
+ public void seteCrnNo(Integer eCrnNo) {
+ this.eCrnNo = eCrnNo;
+ }
+
+ public Integer getSignType() {
+ return signType;
+ }
+
+ public void setSignType(Integer signType) {
+ this.signType = signType;
+ }
+
+ public Integer getSignTypeOther() {
+ return signTypeOther;
+ }
+
+ public void setSignTypeOther(Integer signTypeOther) {
+ this.signTypeOther = signTypeOther;
+ }
+
+ public String getSignTypeOtherBoolean() {
+ return signTypeOtherBoolean;
+ }
+
+ public void setSignTypeOtherBoolean(String signTypeOtherBoolean) {
+ this.signTypeOtherBoolean = signTypeOtherBoolean;
+ }
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 5e948f3..ae2ff5e 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -2,13 +2,20 @@
import com.core.common.Arith;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.RowLastno;
+import com.zy.asrs.service.RowLastnoService;
import com.zy.common.model.LocDetlDto;
import com.zy.common.properties.SlaveProperties;
+import com.zy.common.service.CommonService;
+import com.zy.system.service.UserService;
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
@@ -218,6 +225,27 @@
// System.out.println(deepRow);
// }
+ public static Integer GetWhsType(Integer sourceStaNo) {
+ switch (sourceStaNo){
+ case 104:
+ case 173:
+ case 174:
+ case 175:
+ case 130:
+ case 125:
+ return 5;
+ case 204:
+ case 273:
+ case 274:
+ case 275:
+ case 230:
+ case 225:
+ return 2;
+ default:
+ return 0;
+ }
+ }
+
public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
if (whsType == 1 || whsType==3 || whsType==4) {
return true;
@@ -259,7 +287,15 @@
public static int[] LocNecessaryParameters(Integer whsType, Integer curRow, Integer crnNumber) {
switch (whsType){
case 1://缁忓吀鍙屼几搴撲綅
- return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber);
+ return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
+ case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
+ return LocNecessaryParametersDoubleExtension2(whsType, curRow, crnNumber); //宸插畬鍠�
+ case 3://缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
+ return LocNecessaryParametersDoubleExtension3(whsType, curRow, crnNumber); //鏈畬鍠�
+ case 4://缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
+ return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠�
+ case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
+ return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
}
@@ -268,29 +304,33 @@
//缁忓吀鍙屼几搴撲綅
public static int[] LocNecessaryParametersDoubleExtension(Integer whsType, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ Integer sRow = rowLastno.getsRow();
+ Integer sCrnNo = rowLastno.getsCrnNo();
if (BooleanWhsTypeSta(whsType)) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 4)) {
- necessaryParameters[1] = 1; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 2; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals(crnNumber * 4 - 3)) {
- necessaryParameters[1] = 4; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = 1; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = 3; //nearRow 鏈�娴呭簱浣嶆帓
+ if (curRow.equals(crnNumber * 4 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
+ necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
} else {
curRow = curRow + 4;
- if (curRow < 1 || curRow > (crnNumber * 4)) {
+ if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
- if ((curRow - 1) % 4 == 0) {
+ if ((curRow - sRow) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow + 3) / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow % 4 == 0) {
+ } else if ((curRow - sRow + 1) % 4 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = curRow / 4; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
@@ -312,6 +352,162 @@
necessaryParameters[1] = curRow-2; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = moveCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow-1; //nearRow 鏈�娴呭簱浣嶆帓
+ }
+ return necessaryParameters;
+ }
+
+ //缁忓吀鍗曚几搴撲綅
+ public static int[] LocNecessaryParametersDoubleExtension2(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ Integer sRow = rowLastno.getsRow();
+ Integer sCrnNo = rowLastno.getsCrnNo();
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 2 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
+ necessaryParameters[1] = sRow+1; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 2;
+ if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 2 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 2 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ }
+ }
+ return necessaryParameters;
+ }
+
+ //缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
+ public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ Integer sRow = rowLastno.getsRow();
+ Integer sCrnNo = rowLastno.getsCrnNo();
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 3 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
+ necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 3;
+ if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow-1 ; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ }
+ }
+ return necessaryParameters;
+ }
+
+ //缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
+ public static int[] LocNecessaryParametersDoubleExtension4(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ Integer sRow = rowLastno.getsRow();
+ Integer sCrnNo = rowLastno.getsCrnNo();
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 3 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
+ necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 3;
+ if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1 ; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 3 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ }
+ }
+ return necessaryParameters;
+ }
+
+ //鍙屽伐浣嶅崟浼稿簱浣�
+ public static int[] LocNecessaryParametersDoubleExtension5(Integer whsType, Integer curRow, Integer crnNumber) {
+ int[] necessaryParameters = new int[]{0, 0, 0, 0};
+ RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ Integer sRow = rowLastno.getsRow();
+ Integer sCrnNo = rowLastno.getsCrnNo();
+ if (BooleanWhsTypeSta(whsType)) {
+ necessaryParameters[0] = crnNumber; // 杞娆℃暟
+ //婊℃澘姝ｅ父鍏ュ簱
+ if (curRow.equals(crnNumber * 4 + sRow - 1)) {
+ necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
+ necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ curRow = curRow + 4;
+ if (curRow < sRow || curRow > (crnNumber * 4 + sRow - 1)) {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ if ((curRow - sRow) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow + 2) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 4 == 0) {
+ necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow + 1) / 4 + sCrnNo - 1; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow - 1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else {
+ throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
+ }
+ }
}
return necessaryParameters;
}
@@ -367,27 +563,6 @@
return null;
}
-
- public static Integer GetWhsType(Integer sourceStaNo) {
- switch (sourceStaNo){
- case 104:
- case 173:
- case 174:
- case 175:
- case 130:
- case 125:
- return 5;
- case 204:
- case 273:
- case 274:
- case 275:
- case 230:
- case 225:
- return 2;
- default:
- return 0;
- }
- }
/*
* 鏈�娣卞簱浣嶆帓鍙� 锛� curRow
diff --git a/src/main/resources/mapper/RowLastnoMapper.xml b/src/main/resources/mapper/RowLastnoMapper.xml
index fd58a60..18c3461 100644
--- a/src/main/resources/mapper/RowLastnoMapper.xml
+++ b/src/main/resources/mapper/RowLastnoMapper.xml
@@ -16,6 +16,11 @@
<result column="appe_user" property="appeUser" />
<result column="appe_time" property="appeTime" />
<result column="limint_loc" property="limintLoc" />
+ <result column="s_crn_no" property="sCrnNo" />
+ <result column="e_crn_no" property="eCrnNo" />
+ <result column="sign_type" property="signType" />
+ <result column="sign_type_other" property="signTypeOther" />
+ <result column="sign_type_other_boolean" property="signTypeOtherBoolean" />
</resultMap>
--
Gitblit v1.9.1