From c0bc2548715c8506bc69c5b6625e0810264b9fb6 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 17 十月 2025 15:24:25 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/third/erp/entity/InDetTB.java | 244 ++++++++++++------------------------------------
1 files changed, 64 insertions(+), 180 deletions(-)
diff --git a/src/main/java/com/zy/third/erp/entity/InDetTB.java b/src/main/java/com/zy/third/erp/entity/InDetTB.java
index 64643c2..6e547b0 100644
--- a/src/main/java/com/zy/third/erp/entity/InDetTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InDetTB.java
@@ -1,31 +1,19 @@
package com.zy.third.erp.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
@@ -37,217 +25,113 @@
@TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
+ @TableField("auto_id")
+ private Integer AutoId;
- @ApiModelProperty(value= "")
- @TableField("BillNo")
+ @ApiModelProperty(value = "")
+ @TableField("bill_no")
private String BillNo;
- @ApiModelProperty(value= "")
-
- @TableField("iNo")
+ @ApiModelProperty(value = "")
+ @TableField("i_no")
private Integer iNO;
/**
* erp琛屽敮涓�鐮�
*/
- @ApiModelProperty(value= "erp琛屽敮涓�鐮�")
- @TableField("DetId")
+ @ApiModelProperty(value = "erp琛屽敮涓�鐮�")
+ @TableField("det_id")
private Integer detId;
- @ApiModelProperty(value= "")
- @TableField("ItemId")
- private String itemid;
+ @ApiModelProperty(value = "")
+ @TableField("item_id")
+ private String ItemId;
- @ApiModelProperty(value= "")
- @TableField("ItemCode")
+ @ApiModelProperty(value = "")
+ @TableField("item_code")
private String ItemCode;
- @ApiModelProperty(value= "")
- @TableField("ItemBatch")
+ @ApiModelProperty(value = "")
+ @TableField("item_batch")
private String ItemBatch;
- @ApiModelProperty(value= "")
- @TableField("proType")
+ @ApiModelProperty(value = "")
+ @TableField("pro_type")
private String protype;
- @ApiModelProperty(value= "")
- @TableField("OrderNo")
+ @ApiModelProperty(value = "")
+ @TableField("order_no")
private String OrderNo;
- @ApiModelProperty(value= "")
- @TableField("MainNum")
+ @ApiModelProperty(value = "")
+ @TableField("main_num")
private Double MainNum;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("remark")
private String remark;
- @TableField("WareId")
+ @TableField("ware_id")
private String wareId;
- @TableField("WareName")
+ @TableField("ware_name")
private String WareName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("temp1")
private String temp1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("temp2")
private String temp2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("temp3")
private String temp3;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("MakeDate")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("make_date")
private Date makedate;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("LKName")
private String LKName;
+ /**
+ *
+ */
+ @TableField("fact_area")
+ private String FactArea;
+ /**
+ * 渚涘簲鍟哱瀹㈡埛ID
+ */
+ @TableField("packing")
+ private String Packing;
+ /**
+ * 棰滆壊
+ */
+ @TableField("s_color")
+ private String sColor;
+
+// /**
+// * 鐐夊彿\瀹㈡埛鍥惧彿
+// */
+// @TableField("LuHao")
+// private String LuHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("s_pg_no")
+ private String sPgNO;
-
-
-// InDetTB inDetTB = new InDetTB(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // erp琛屽敮涓�鐮乕闈炵┖]
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Integer getINO() {
- return iNO;
- }
-
- public void setINO(Integer iNO) {
- this.iNO = iNO;
- }
-
- public Integer getDetId() {
- return detId;
- }
-
- public void setDetId(Integer detId) {
- this.detId = detId;
- }
-
- public String getItemid() {
- return itemid;
- }
-
- public void setItemid(String itemid) {
- this.itemid = itemid;
- }
-
- public String getItemCode() {
- return ItemCode;
- }
-
- public void setItemCode(String ItemCode) {
- this.ItemCode = ItemCode;
- }
-
- public String getItemBatch() {
- return ItemBatch;
- }
-
- public void setItemBatch(String ItemBatch) {
- this.ItemBatch = ItemBatch;
- }
-
- public String getProtype() {
- return protype;
- }
-
- public void setProtype(String protype) {
- this.protype = protype;
- }
-
- public Double getMainNum() {
- return MainNum;
- }
-
- public void setMainNum(Double MainNum) {
- this.MainNum = MainNum;
- }
-
- public String getOrderNo() {
- return OrderNo;
- }
-
- public void setOrderNo(String OrderNo) {
- this.OrderNo = OrderNo;
- }
-
- public Date getMakedate() {
- return makedate;
- }
-
- public String getMakedate$(){
- if (Cools.isEmpty(this.makedate)){
+ public String getMakedate$() {
+ if (Cools.isEmpty(this.makedate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
- }
-
- public void setMakedate(Date makedate) {
- this.makedate = makedate;
- }
-
- public String getRemark() {
- return remark;
- }
-
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public String getTemp1() {
- return temp1;
- }
-
- public void setTemp1(String temp1) {
- this.temp1 = temp1;
- }
-
- public String getTemp2() {
- return temp2;
- }
-
- public void setTemp2(String temp2) {
- this.temp2 = temp2;
- }
-
- public String getTemp3() {
- return temp3;
- }
-
- public void setTemp3(String temp3) {
- this.temp3 = temp3;
}
--
Gitblit v1.9.1