From 3d57910ed5c971d143b71af4f9bfb4c18dcf6e9d Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期一, 06 十二月 2021 15:56:13 +0800
Subject: [PATCH] 1.0.3
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 12 +++---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 22 +++++------
src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java | 8 +++
src/main/java/com/zy/asrs/entity/BasDevp.java | 4 ++
src/main/resources/mapper/WaitPakinMapper.xml | 10 ++---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 16 +++++++-
src/main/java/com/zy/common/web/WcsController.java | 6 +++
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 2
src/main/java/com/zy/common/service/CommonService.java | 24 ++++++++---
src/main/resources/application.yml | 2
src/main/java/com/zy/asrs/entity/BasCrnStatus.java | 1
11 files changed, 70 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
index fdc4a58..49c5046 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnStatus.java
@@ -9,7 +9,6 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
-
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 78ca14c..1f808e1 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -11,6 +11,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -214,6 +215,9 @@
@TableField("cart_pos")
private Integer cartPos;
+ public BasDevp() {
+ }
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 2597e70..e474bfc 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -18,36 +18,34 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "浜у搧缂栫爜")
- @TableId(value = "mat_no")
- private String matNo;
+ private String matnr;
@ApiModelProperty(value= "浜у搧鍚嶇О")
- @TableId(value = "mat_name")
- private String matName;
+ private String maktx;
- @ApiModelProperty(value= "瑙勬牸")
- private String specs;
+// @ApiModelProperty(value= "瑙勬牸")
+// private String specs;
- @ApiModelProperty(value= "灏哄")
- private String size;
+// @ApiModelProperty(value= "灏哄")
+// private String size;
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍗曢噸")
- private Double weight;
+// @ApiModelProperty(value= "鍗曢噸")
+// private Double weight;
/**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
- private Double qty;
+ private Double anfme;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- private String unit;
+ private String altme;
/**
* 浠撳簱鍙�
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 1f87a7d..79163b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -55,7 +55,7 @@
if(station.getLoading()==null || !station.getLoading().equals("Y")) {
throw new CoolException(devpNo+"绔欑偣鏃犵墿");
}
- if(station.getWrkNo()!=null && station.getWrkNo()>0) {
+ if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo()<9001) {
throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
}
if(wrkMastService.getWorkingMast(devpNo)>0){
diff --git a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
index f5e16b1..adccb2b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
@@ -119,8 +119,14 @@
if (Cools.isEmpty(staDesc)) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
+ int rok;
+ if(ioType==103){
+ rok=2;
+ }else{
+ rok=1;
+ }
// 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+ int workNo = commonService.getWorkNo(rok);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index c1518be..75144c6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -74,6 +74,7 @@
@Override
@Transactional
+ //鍏ュ簱
public String startupFullPutStore(FullStoreParam param, Long userId) {
// 鍙傛暟闈炵┖鍒ゆ柇
if (Cools.isEmpty(param.getDevpNo(), param.getList())) {
@@ -169,6 +170,7 @@
@Override
@Transactional
+ //鍑哄簱浣滀笟
public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Integer ioType, Long userId) {
// 鍚堝苟鍚岀被椤�
@@ -207,7 +209,13 @@
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
// 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+ int rok;
+ if(ioType==103||ioType==107){
+ rok=2;
+ }else{
+ rok=1;
+ }
+ int workNo = commonService.getWorkNo(rok);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
@@ -309,6 +317,7 @@
@Override
@Transactional
+ //绌烘澘鍏ュ簱
public String emptyPlateIn(Integer devpNo, Long userId) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
@@ -368,18 +377,20 @@
@Override
@Transactional
+ //绌烘澘鍑哄簱
public void emptyPlateOut(EmptyPlateOutParam param, Long userId) {
if (Cools.isEmpty(param.getOutSite())) {
throw new CoolException("绔欑偣涓嶅瓨鍦�");
}
for (String locNo : param.getLocNos()) {
// 鑾峰彇宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+ int workNo = commonService.getWorkNo(1);
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(locNo);
if (Cools.isEmpty(locMast)) {
throw new CoolException(locNo+"搴撲綅涓嶅瓨鍦�");
}
+
// 鑾峰彇婧愮珯
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", 110)
@@ -429,6 +440,7 @@
@Override
@Transactional
+ //鐩樼偣鍑哄簱
public void locCheckOut(StockOutParam param, Long userId) {
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index dc9cad3..d7ca9f8 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -55,13 +55,13 @@
}
public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
- waitPakIn.setMatNo(matCode.getMatNo()); // 浜у搧缂栧彿
- waitPakIn.setMatName(matCode.getMatName()); // 浜у搧鎻忚堪
- waitPakIn.setSpecs(matCode.getSpecs()); // 瑙勬牸
- waitPakIn.setUnit(matCode.getUnit()); // 鍗曚綅
- waitPakIn.setSize(matCode.getSize()); // 灏哄
+ waitPakIn.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+ waitPakIn.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
+ waitPakIn.setLgnum(matCode.getSpecs()); // 瑙勬牸
+ waitPakIn.setAltme(matCode.getUnit()); // 鍗曚綅
+ waitPakIn.setType(matCode.getSize()); // 灏哄
waitPakIn.setColor(matCode.getColor()); // 棰滆壊
- waitPakIn.setWeight(matCode.getWeight()); // 鍗曢噸
+ //waitPakIn.setWeight(matCode.getWeight()); // 鍗曢噸
}
// excel ----------------------------------------------------------------------
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ebe039b..23c8432 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -49,7 +49,7 @@
/**
* 鐢熸垚宸ヤ綔鍙�
- * @param wrkMk 0:鍏ュ嚭搴� ; 1:鍏朵粬
+ * @param wrkMk 0:鍏ュ簱 ; 1:鍑哄簱锛�2鎷ｉ��
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
@@ -59,7 +59,7 @@
}
int workNo = 0;
// 鍏ュ嚭搴撶被鍨�
- if (wrkLastno.getWrkMk() == 0) {
+ if (wrkLastno.getWrkMk() == 0 || wrkLastno.getWrkMk() == 1 || wrkLastno.getWrkMk() == 2) {
workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
@@ -105,11 +105,15 @@
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, boolean emptyMk, List<String> matNos, LocTypeDto locTypeDto, LocTypeDto oldLocType, int times) {
StartupDto startupDto = new StartupDto();
// 鐢熸垚宸ヤ綔鍙�
- if (sourceStaNo == 103) {
+ int crnNo = 0;
+ if (sourceStaNo < 200) {
whsType = 1;
- } else if (sourceStaNo == 203) {
+ crnNo=1;
+ } else if (sourceStaNo >= 200) {
whsType = 2;
+ crnNo=2;
}
+
int workNo = getWorkNo(0);
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
@@ -121,12 +125,12 @@
int crn_qty = rowLastno.getCrnQty(); // 鍫嗗灈鏈烘暟閲忥紙宸烽亾鏁伴噺锛�
int rowCount = eRow - sRow + 1; // 搴撴帓鎬绘暟
// 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
+// int crnNo = 0;
// 鐩爣搴撲綅
LocMast locMast = null;
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
- if (!Cools.isEmpty(matNos)) {
+ if (!Cools.isEmpty(matNos) && sourceStaNo < 200) {
List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
@@ -235,7 +239,12 @@
// 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
if (locMast == null) {
if (Utils.isShallowLoc(slaveProperties, curRow)) {
- Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
+ Integer deepRow = 0;
+ if(curRow == 2) {
+ deepRow = Utils.getDeepRow(slaveProperties, curRow);
+ } else {
+ deepRow = curRow;
+ }
locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1(), locTypeDto.getLocType2(), locTypeDto.getLocType3());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (!locMastService.checkEmptyCount(locMast)) {
@@ -420,6 +429,7 @@
// startupDto.setLocNo(locNo);
// return startupDto;
// }
+//鍑烘繁搴撲綅鎵樼洏
public static void main(String[] args) {
System.out.println(Arith.remainder(1, 4));
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d3c84c0..93875d0 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -11,6 +11,7 @@
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.SearchLocParam;
+import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -76,6 +77,10 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+ if (Cools.isEmpty(sourceStaNo)){
+ return R.error("鍏ュ簱绔欑偣涓嶅瓨鍦�");
+ }
+ sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
locTypeDto.setLocType1(param.getLocType1());
@@ -165,6 +170,7 @@
return dto;
}
+ @Synchronized
@Transactional
public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 86812f3..a4ad3bb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,7 +19,7 @@
#url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
#username: sa
#password: eisoft
- url: jdbc:sqlserver://192.168.4.208:1433;databasename=sxjzasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=sxjzasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/WaitPakinMapper.xml b/src/main/resources/mapper/WaitPakinMapper.xml
index 7608ef1..6fd732a 100644
--- a/src/main/resources/mapper/WaitPakinMapper.xml
+++ b/src/main/resources/mapper/WaitPakinMapper.xml
@@ -4,16 +4,14 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.WaitPakin">
- <result column="mat_no" property="matNo" />
- <result column="mat_name" property="matName" />
- <result column="specs" property="specs" />
- <result column="size" property="size" />
+ <result column="matnr" property="matnr" />
+ <result column="maktx" property="maktx" />
<result column="color" property="color" />
<result column="supplier" property="supplier" />
<result column="warehouse" property="warehouse" />
<result column="brand" property="brand" />
- <result column="qty" property="qty" />
- <result column="unit" property="unit" />
+ <result column="anfme" property="anfme" />
+ <result column="altme" property="altme" />
<result column="zpallet" property="zpallet" />
<result column="bname" property="bname" />
<result column="loc_no" property="locNo" />
--
Gitblit v1.9.1