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/DocType.java | 74 ++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/DocType.java b/src/main/java/com/zy/asrs/entity/DocType.java
index f63eaba..14e5776 100644
--- a/src/main/java/com/zy/asrs/entity/DocType.java
+++ b/src/main/java/com/zy/asrs/entity/DocType.java
@@ -1,24 +1,20 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
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.system.service.UserService;
import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@TableName("man_doc_type")
@@ -40,6 +36,18 @@
@ApiModelProperty(value= "绫诲瀷鍚嶇О")
@TableField("doc_name")
private String docName;
+
+ /**
+ * 鍏ュ簱 1: 鍏ュ簱 0: 闈炲叆搴�
+ */
+ @ApiModelProperty(value= "鍏ュ簱 1: 鍏ュ簱 0: 闈炲叆搴� ")
+ private Integer pakin;
+
+ /**
+ * 鍑哄簱 1: 鍑哄簱 0: 闈炲嚭搴�
+ */
+ @ApiModelProperty(value= "鍑哄簱 1: 鍑哄簱 0: 闈炲嚭搴� ")
+ private Integer pakout;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
@@ -83,29 +91,29 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public DocType() {}
-
- public DocType(Long docId,String docName,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.docId = docId;
- this.docName = docName;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
+ public String getPakin$() {
+ if (null == this.pakin){ return null; }
+ switch (this.pakin){
+ case 1:
+ return "鍏ュ簱";
+ case 0:
+ return "闈炲叆搴�";
+ default:
+ return String.valueOf(this.pakin);
+ }
}
-// DocType docType = new DocType(
-// null, // 绫诲瀷缂栧彿[闈炵┖]
-// null, // 绫诲瀷鍚嶇О
-// null, // 鐘舵��
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
+ public String getPakout$() {
+ if (null == this.pakout){ return null; }
+ switch (this.pakout){
+ case 1:
+ return "鍑哄簱";
+ case 0:
+ return "闈炲嚭搴�";
+ default:
+ return String.valueOf(this.pakout);
+ }
+ }
public String getStatus$(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1