From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 13 四月 2024 14:58:24 +0800
Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步，增加水分，挥发段，分解段搜索，按照最大最小范围，包装类型跟托盘类型增加删选功能。 2.已经出库的物料，在明细表里面隐藏掉，但是数据保留。 3.增加二个跟聚乳酸一样的明细表，分改性树脂，纯树脂库存明细表，所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下，相对压缩一下，搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理，举例原有系统里面销售选定的10包物料，再二次重新弄后，车间打印新标签，使用新的包号，在明细表里面体现原有所有指标信息及批号，包号，牌号跟新的关联 7.出库时候时间可选历史，不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 98 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 90 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index da61de9..1922dc7 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -1,11 +1,13 @@
package com.zy.asrs.entity;
+import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -43,6 +45,7 @@
*/
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@TableField("order_no")
+ @ExcelProperty({"鍗曟嵁", "鍗曟嵁缂栧彿"})
private String orderNo;
@@ -50,6 +53,7 @@
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
+ @ExcelProperty({"鍗曟嵁", "鏁伴噺"})
private Double anfme;
/**
@@ -60,6 +64,7 @@
*/
@ApiModelProperty(value= "浣滀笟鏁伴噺")
@TableField("work_qty")
+ @ExcelProperty({"鍗曟嵁", "浣滀笟鏁伴噺"})
private Double workQty;
/**
@@ -69,30 +74,34 @@
* 鍑哄簱 : qty 馃憜
*/
@ApiModelProperty(value= "瀹屾垚鏁伴噺")
+ @ExcelProperty({"鍗曟嵁", "瀹屾垚鏁伴噺"})
private Double qty;
/**
* 鍟嗗搧缂栫爜
*/
@ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ExcelProperty({"鍗曟嵁", "鍟嗗搧缂栫爜"})
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ExcelProperty({"鍗曟嵁", "鍟嗗搧鍚嶇О"})
private String maktx;
/**
- * 搴忓垪鐮�
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "搴忓垪鐮�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String batch;
/**
* 瑙勬牸
*/
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty({"鍗曟嵁", "瑙勬牸"})
private String specs;
/**
@@ -180,6 +189,7 @@
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
+ @ExcelProperty({"鍗曟嵁", "閲嶉噺"})
private Double weight;
/**
@@ -295,9 +305,76 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鎷ユ湁鑰�
+ */
+ @ApiModelProperty(value= "鎷ユ湁鑰� 1: 鏉板厠 ")
+ @ExcelProperty({"鍗曟嵁", "璐т富ID"})
+ private Integer owner;
+
+ /**
+ * 璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�
+ */
+ @ApiModelProperty(value= "璐х墿褰㈡��:0锛氫唬閲囥��1锛氫粨鍌�")
+ @ExcelProperty({"鍗曟嵁", "璐х墿褰㈡�両D"})
+ private Integer payment;
+
+ /**
+ * uuid鏃堕棿鎴�
+ */
+ @ApiModelProperty(value= "uuid")
+ @TableId(value = "uuid", type = IdType.ID_WORKER_STR)
+ @TableField("uuid")
+ private String uuid;
+
+ //鏈�澶х啍鎸�
+ private double fingerMeltingMin;
+ //鏈�灏忕啍鎸�
+ private double fingerMeltingMax;
+ //鏈�澶х啍鐐�
+ private double fusingPointMin;
+ //鏈�灏忕啍鐐�
+ private double fusingPointMax;
+ //鏈�澶ч粍搴�
+ private double yellownessMin;
+ //鏈�澶ч粍搴�
+ private double yellownessMax;
+ //鏈�灏忎笉閫忔槑搴�
+ private double opacityMin;
+ //鏈�澶т笉閫忔槑搴�
+ private double opacityMax;
+
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
+ public String getPayment$(){
+ if (null == this.payment){ return null; }
+ switch (this.payment){
+ case 1:
+ return "浠撳偍";
+ case 0:
+ return "浠ｉ噰";
+ default:
+ return String.valueOf(this.payment);
+ }
+ }
+
public OrderDetl() {}
- public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, 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, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr,
+ String maktx, String batch, 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, Integer status, Long createBy,
+ Date createTime, Long updateBy, Date updateTime, String memo,int owner ,int payment,String uuid) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -337,6 +414,9 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.owner = owner;
+ this.payment = payment;
+ this.uuid = uuid;
}
public String getOrderId$(){
@@ -443,13 +523,15 @@
}
public Double getEnableQty() {
+ Double enableQty = null;
if (null != this.anfme && this.workQty != null) {
- return this.anfme - this.workQty;
+ enableQty = this.anfme - this.workQty;
+ if (enableQty <0){
+ enableQty = 0.0D;
+ }
+
}
-// if (null != this.anfme && this.qty != null) {
-// return this.anfme - this.qty;
-// }
- return null;
+ return enableQty;
}
public void sync(Object source) {
--
Gitblit v1.9.1