From 083841bb6c40097e19b17022454fcc7f12b7f092 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期六, 02 八月 2025 08:59:49 +0800
Subject: [PATCH] 1.更换订单出库策略，走托盘多的物料先出 2.完善出库作业工作档丢失导致出库站电视机不显示
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
index 9db0c83..c1f3787 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocDetl.java
@@ -3,15 +3,17 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.utils.Synchro;
+import com.zy.asrs.common.wms.service.DocTypeService;
import com.zy.asrs.common.wms.service.LocMastService;
+import com.zy.asrs.common.wms.service.MatService;
+import com.zy.asrs.common.wms.service.OrderService;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,6 +26,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
@Data
@TableName("wms_loc_detl")
@@ -39,12 +42,14 @@
* 搴撲綅鍙�
*/
@ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField("loc_no")
private String locNo;
/**
* 鎵樼洏鏉＄爜
*/
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
+ @TableField("zpallet")
private String zpallet;
/**
@@ -69,6 +74,7 @@
private String batch;
@ApiModelProperty(value= "")
+ @TableField("order_no")
private String orderNo;
/**
@@ -114,12 +120,15 @@
private String manu;
@ApiModelProperty(value= "")
+ @TableField("manu_date")
private String manuDate;
@ApiModelProperty(value= "")
+ @TableField("item_num")
private String itemNum;
@ApiModelProperty(value= "")
+ @TableField("safe_qty")
private Double safeQty;
@ApiModelProperty(value= "")
@@ -132,21 +141,26 @@
private Double volume;
@ApiModelProperty(value= "")
+ @TableField("three_code")
private String threeCode;
@ApiModelProperty(value= "")
private String supp;
@ApiModelProperty(value= "")
+ @TableField("supp_code")
private String suppCode;
@ApiModelProperty(value= "")
+ @TableField("be_batch")
private Integer beBatch;
@ApiModelProperty(value= "")
+ @TableField("dead_time")
private String deadTime;
@ApiModelProperty(value= "")
+ @TableField("dead_warn")
private Integer deadWarn;
@ApiModelProperty(value= "")
@@ -162,6 +176,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("modi_user")
private Long modiUser;
/**
@@ -169,12 +184,14 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
+ @TableField("appe_user")
private Long appeUser;
/**
@@ -182,6 +199,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("appe_time")
private Date appeTime;
/**
@@ -194,11 +212,16 @@
* 鎺堟潈鍟嗘埛
*/
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
+ @TableField("host_id")
private Long hostId;
+
+ @ApiModelProperty(value= "璐т富")
+ @TableField("owner")
+ private String owner;
public LocDetl() {}
- public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId) {
+ public LocDetl(String locNo,String zpallet,Double anfme,String matnr,String maktx,String batch,String orderNo,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String memo,Long hostId,String owner) {
this.locNo = locNo;
this.zpallet = zpallet;
this.anfme = anfme;
@@ -238,6 +261,7 @@
this.appeTime = appeTime;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// LocDetl locDetl = new LocDetl(
@@ -281,6 +305,23 @@
// null, // 澶囨敞
// null // 鎺堟潈鍟嗘埛
// );
+
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = null;
+ if (hostId!=null){
+ mat = service.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr).eq(Mat::getHostId,hostId));
+ }else {
+ List<Mat> list = service.list(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+ if (!list.isEmpty()){
+ mat =list.get(0);
+ }
+ }
+ if (!Cools.isEmpty(mat)){
+ return mat;
+ }
+ return null;
+ }
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -332,5 +373,21 @@
return null;
}
+ public String getOrderType() {
+ if (Cools.isEmpty(this.orderNo)){
+ return "";
+ }
+ OrderService orderService = SpringUtils.getBean(OrderService.class);
+ DocTypeService docTypeService = SpringUtils.getBean(DocTypeService.class);
+ Order order = orderService.selectByNo(orderNo, hostId);
+ if (order != null) {
+ return order.getDocType$();
+ }
+ return this.orderNo;
+ }
+
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
--
Gitblit v1.9.1