From 83a2358f858495e9f2e4a4a35d9959b72cfcd573 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 08 一月 2024 17:00:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastSta.java | 67 ++++++++++++++++++---------------
src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java | 3 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 3 +
src/main/java/com/zy/common/service/CommonService.java | 2
4 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java b/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
index 6e2e0ca..6739620 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
@@ -1,5 +1,7 @@
package com.zy.asrs.entity;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.baomidou.mybatisplus.annotations.TableField;
@@ -18,6 +20,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastSta.java b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
index 5573e82..ea168c3 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastSta.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastSta.java
@@ -1,11 +1,15 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.core.common.Cools;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
import org.springframework.format.annotation.DateTimeFormat;
+
import java.text.SimpleDateFormat;
import java.util.Date;
import java.text.SimpleDateFormat;
@@ -14,6 +18,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -25,99 +30,100 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableField("wrk_no")
private Long wrkNo;
/**
* 宸ヤ綔妗ｅ紑濮嬩綅缃�
*/
- @ApiModelProperty(value= "宸ヤ綔妗ｅ紑濮嬩綅缃�")
+ @ApiModelProperty(value = "宸ヤ綔妗ｅ紑濮嬩綅缃�")
@TableField("wrk_start")
private Integer wrkStart;
/**
* 宸ヤ綔妗ｇ粨鏉熶綅缃�
*/
- @ApiModelProperty(value= "宸ヤ綔妗ｇ粨鏉熶綅缃�")
+ @ApiModelProperty(value = "宸ヤ綔妗ｇ粨鏉熶綅缃�")
@TableField("wrk_end")
private Integer wrkEnd;
/**
* 灏忚溅鎺ヨ揣浣嶇疆
*/
- @ApiModelProperty(value= "灏忚溅鎺ヨ揣浣嶇疆")
+ @ApiModelProperty(value = "灏忚溅鎺ヨ揣浣嶇疆")
@TableField("sta_start")
private Integer staStart;
/**
* 灏忚溅鏀捐揣浣嶇疆
*/
- @ApiModelProperty(value= "灏忚溅鏀捐揣浣嶇疆")
+ @ApiModelProperty(value = "灏忚溅鏀捐揣浣嶇疆")
@TableField("sta_end")
private Integer staEnd;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 绫诲瀷 0:闈炵┖ 1:绌烘澘
*/
- @ApiModelProperty(value= "绫诲瀷 0:闈炵┖ 1:绌烘澘")
+ @ApiModelProperty(value = "绫诲瀷 0:闈炵┖ 1:绌烘澘")
private Integer type;
/**
* 宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵�� 0锛氬垵濮� 1锛氱瓑寰呭皬杞﹀彇 2锛氱瓑寰呭皬杞︽斁 3锛氬畬鎴�")
@TableField("wrk_sts")
private Integer wrkSts;
/**
* 琛屽彿
*/
- @ApiModelProperty(value= "琛屽彿")
+ @ApiModelProperty(value = "琛屽彿")
@TableField("line_number")
private Integer lineNumber;
/**
* 宸ヤ綔绫诲瀷
*/
- @ApiModelProperty(value= "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�")
+ @ApiModelProperty(value = "宸ヤ綔绫诲瀷 1:鍙栵紙鍙犵洏锛� 2锛氭斁 3锛氬彇鏀� 4锛氭媶鐩�")
@TableField("wrk_type")
private Integer wrkType;
/**
* 鏍囪鏃堕棿
*/
- @ApiModelProperty(value= "鏍囪鏃堕棿")
+ @ApiModelProperty(value = "鏍囪鏃堕棿")
@TableField("bign_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date bignTime;
- public WrkMastSta() {}
+ public WrkMastSta() {
+ }
- public WrkMastSta(WrkMast wrkMast,Date now,BasDevp basDevp) {
+ public WrkMastSta(WrkMast wrkMast, Date now, BasDevp basDevp) {
this.wrkNo = wrkMast.getWrkNo().longValue();
this.wrkStart = wrkMast.getSourceStaNo();
this.wrkEnd = wrkMast.getStaNo();
@@ -129,7 +135,7 @@
this.bignTime = now;
}
- public WrkMastSta(Long wrkNo,Integer wrkStart,Integer wrkEnd,Integer staStart,Integer staEnd,Date createTime,Date updateTime,Integer type,Integer wrkSts,Integer lineNumber,Integer wrkType,Date bignTime) {
+ public WrkMastSta(Long wrkNo, Integer wrkStart, Integer wrkEnd, Integer staStart, Integer staEnd, Date createTime, Date updateTime, Integer type, Integer wrkSts, Integer lineNumber, Integer wrkType, Date bignTime) {
this.wrkNo = wrkNo;
this.wrkStart = wrkStart;
this.wrkEnd = wrkEnd;
@@ -159,37 +165,38 @@
// null // 鏍囪鏃堕棿
// );
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public String getBignTime$(){
- if (Cools.isEmpty(this.bignTime)){
+ public String getBignTime$() {
+ if (Cools.isEmpty(this.bignTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.bignTime);
}
- public Integer getStaEnd(Integer souSta){
- switch (souSta){
+ public Integer getStaEnd(Integer souSta) {
+ switch (souSta) {
case 100:
case 103:
case 106:
case 109:
case 112:
case 115:
- return souSta+1;
- default:return souSta;
+ return souSta + 1;
+ default:
+ return souSta;
}
}
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 2d9de8d..75290f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -742,8 +742,8 @@
Date now = new Date();
- long rollUp = now.getTime();
for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ long rollUp = new Date().getTime();
Mat mat = matService.selectByMatnr(matList.getMatnr());
if (Cools.isEmpty(mat)) {
throw new CoolException(matList.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
@@ -770,6 +770,7 @@
locDetlRullUpDetail.setUuid(rollUp);
locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
locDetlRullUpDetail.setRollWeight(matDetlList.getWeightDetl().toString());
+ locDetlRullUpDetailService.insert(locDetlRullUpDetail);
}
}
if (!waitPakinService.insert(waitPakin)) {
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ae8a351..51a8cbb 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -318,7 +318,7 @@
if (Cools.isEmpty(locMast) && crnNo != 0) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
for (LocMast locMast1 : locMasts) {
- if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
--
Gitblit v1.9.1