From 088862ec1ec708f9660fe8547ad6038462da1cd1 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 18 七月 2024 19:16:17 +0800
Subject: [PATCH] 中间表代码提交,代码整理
---
src/main/java/com/zy/third/erp/entity/ItemTB.java | 4
src/main/java/com/zy/third/erp/entity/InDetTB.java | 2
src/main/java/com/zy/third/lk/entity/OutHedTBBak.java | 115 -----
src/main/java/com/zy/asrs/utils/EntityToMapConverter.java | 63 +++
src/main/java/com/zy/third/lk/entity/InDetTB.java | 176 +-------
src/main/java/com/zy/third/lk/entity/InCancelTB.java | 62 --
src/main/java/com/zy/third/erp/task/ERPItemScheduler.java | 15
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 2
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 7
src/main/java/com/zy/third/lk/entity/OutHedTB.java | 132 +-----
src/main/java/com/zy/third/erp/entity/InCancelTB.java | 5
src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java | 6
src/main/java/com/zy/third/lk/entity/InHedTB.java | 148 +------
src/main/java/com/zy/third/lk/entity/OutDetTBBak.java | 194 +--------
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 4
src/main/java/com/zy/third/lk/entity/OutDetTB.java | 188 +--------
src/main/java/com/zy/third/erp/entity/InHedTB.java | 5
src/main/resources/application.yml | 2
18 files changed, 251 insertions(+), 879 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/EntityToMapConverter.java b/src/main/java/com/zy/asrs/utils/EntityToMapConverter.java
new file mode 100644
index 0000000..bfa2abe
--- /dev/null
+++ b/src/main/java/com/zy/asrs/utils/EntityToMapConverter.java
@@ -0,0 +1,63 @@
+package com.zy.asrs.utils;
+
+import com.core.common.DateUtils;
+import lombok.SneakyThrows;
+
+import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.lang.reflect.Modifier;
+
+public class EntityToMapConverter {
+ @SneakyThrows
+ public static Map<String, Object> entityToMapWithRandomValues(Object entity) {
+ Map<String, Object> map = new HashMap<>();
+ Field[] fields = entity.getClass().getDeclaredFields();
+ Random random = new Random();
+
+ for (Field field : fields) {
+ if (Modifier.isStatic(field.getModifiers()) || Modifier.isFinal(field.getModifiers())) {
+ // Ignore static or final fields
+ continue;
+ }
+ field.setAccessible(true);
+ String fieldName = field.getName();
+ Object fieldValue = field.get(entity);
+
+ // Set random values based on type
+ if (field.getType() == String.class) {
+ map.put(fieldName, "'" + generateRandomString(10) + "'");
+ } else if (field.getType() == Integer.class || field.getType() == int.class) {
+ map.put(fieldName, random.nextInt(1000));
+ } else if (field.getType() == Long.class || field.getType() == long.class) {
+ map.put(fieldName, random.nextLong() % 1000L);
+ } else if (field.getType() == Float.class || field.getType() == float.class) {
+ map.put(fieldName, random.nextFloat() * 1000f);
+ } else if (field.getType() == Double.class || field.getType() == double.class) {
+ map.put(fieldName, random.nextDouble() * 1000d);
+ } else if (field.getType() == Boolean.class || field.getType() == boolean.class) {
+ map.put(fieldName, random.nextBoolean());
+ } else if (field.getType() == BigDecimal.class) {
+ map.put(fieldName, new BigDecimal(random.nextDouble() * 1000d));
+ } else if (field.getType() == Date.class) {
+ map.put(fieldName, "'" + DateUtils.convert(new Date()) + "'");
+ } else {
+ // For other types, you might want to handle them specifically or skip them
+ continue;
+ }
+ }
+ return map;
+ }
+
+ private static String generateRandomString(int length) {
+ String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+ StringBuilder sb = new StringBuilder(length);
+ for (int i = 0; i < length; i++) {
+ sb.append(characters.charAt(new Random().nextInt(characters.length())));
+ }
+ return sb.toString();
+ }
+}
diff --git a/src/main/java/com/zy/third/erp/entity/InCancelTB.java b/src/main/java/com/zy/third/erp/entity/InCancelTB.java
index fe5f95d..add2606 100644
--- a/src/main/java/com/zy/third/erp/entity/InCancelTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InCancelTB.java
@@ -43,6 +43,11 @@
@TableField("LKName")
private String LKName;
+
+ @ApiModelProperty(value= "")
+ @TableField("FactArea")
+ private String FactArea;
+
// InCancelTB inCancelTB = new InCancelTB(
// null, // [闈炵┖]
// null, //
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..ef5df29 100644
--- a/src/main/java/com/zy/third/erp/entity/InDetTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InDetTB.java
@@ -37,7 +37,7 @@
@TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
+ private Integer AutoId;
@ApiModelProperty(value= "")
@TableField("BillNo")
diff --git a/src/main/java/com/zy/third/erp/entity/InHedTB.java b/src/main/java/com/zy/third/erp/entity/InHedTB.java
index a956d3b..95b65d4 100644
--- a/src/main/java/com/zy/third/erp/entity/InHedTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InHedTB.java
@@ -30,7 +30,7 @@
@TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
+ private Integer AutoId;
@ApiModelProperty(value= "")
@TableId(value = "BillNo", type = IdType.INPUT)
@@ -103,9 +103,6 @@
private String LKName;
- public InHedTB(String BillNo) {
- this.BillNo = BillNo;
- }
// InHedTB inHedTB = new InHedTB(
// null, // [闈炵┖]
diff --git a/src/main/java/com/zy/third/erp/entity/ItemTB.java b/src/main/java/com/zy/third/erp/entity/ItemTB.java
index cc0518a..2f95211 100644
--- a/src/main/java/com/zy/third/erp/entity/ItemTB.java
+++ b/src/main/java/com/zy/third/erp/entity/ItemTB.java
@@ -23,7 +23,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "AutoId", type = IdType.AUTO)
- private Integer autoId;
+ private Integer AutoId;
@ApiModelProperty(value= "")
@TableId(value = "ItemId", type = IdType.INPUT)
@@ -69,7 +69,7 @@
private String Flag;
@ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss.fff")
@TableField("MakeDate")
private Date MakeDate;
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
index 9eeaa26..3e8aacd 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -14,9 +14,9 @@
@Slf4j
@Component
public class ERPInCancelScheduler {
+
@Value("${erp.enabled}")
private Boolean erpEnabled;
-
@Autowired
private ERPInCancelSchedulerMS inMS;
@@ -25,11 +25,13 @@
private ErpSqlServer erpSqlServer;
@Scheduled(cron = "${erp.refreshtime}")
- public void itemScheduler() {
+ public void InCancelScheduler() {
+ log.info("InCancelScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInCancelTB = "select * from erp_InCancelTB where LKName='涓壃浜屾湡'";
List<InCancelTB> ins = erpSqlServer.select(sqlInCancelTB, InCancelTB.class);
for (InCancelTB in : ins) {
+ System.out.println(in);
com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in);
if (lkCancel != null) {
HashMap<String, String> condition = new HashMap<>();
diff --git a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
index e8b8a2e..cd51026 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -3,6 +3,7 @@
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.third.erp.entity.InDetTB;
import com.zy.third.erp.entity.InHedTB;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
@@ -16,6 +17,7 @@
/**
* 鍏ュ簱鍗曟嵁
*/
+@Slf4j
@Component
public class ERPInHedTBScheduler {
@@ -32,11 +34,13 @@
@Scheduled(cron = "${erp.refreshtime}")
public void InHedTBScheduler() {
+ log.info("InHedTBScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInHed = "select * from erp_InHedTB where LKName='涓壃浜屾湡'";
List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
if (inHeds.size() > 0) {
for (InHedTB inHed : inHeds) {
+ System.out.println(inHed);
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + inHed.getBillNo() + "'");
List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
index 2ee50c9..b4b10c9 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -2,6 +2,7 @@
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.third.erp.entity.ItemTB;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
@@ -12,6 +13,7 @@
/**
* 鐗╂枡妗ｆ
*/
+@Slf4j
@Component
public class ERPItemScheduler {
@Value("${erp.enabled}")
@@ -25,16 +27,13 @@
@Scheduled(cron = "${erp.refreshtime}")
public void ItemScheduler() {
+ log.info("ItemScheduler寮�濮嬩簡");
if (!erpEnabled) return;
-
-// String selectALL = "SELECT AutoId AS autoId,ItemId AS ItemID,ItemCode AS ItemCode,ItemName AS ItemName ,ItemSpc AS ItemSpc,ItemPic AS itemPic,ItemUnit AS ItemUnit,ItemKind AS ItemKind ,Remark AS remark ,Flag AS flag ,MakeDate AS makedate,Temp1 AS temp1,Temp2 AS temp2 ,Temp3 AS temp3 FROM dbo.erp_ItemTB";
-// List<ItemTB> itemTBS = erpSqlServer.select(selectALL, ItemTB.class);
-// List<ItemTB> itemTBS = erpSqlServer.selectAll(ItemTB.class);
-
String sqlItemTB = "select * from erp_ItemTB where LKName='涓壃浜屾湡'";
List<ItemTB> itemTBS = erpSqlServer.select(sqlItemTB, ItemTB.class);
if (itemTBS != null && itemTBS.size() > 0) {
for (ItemTB itemTB : itemTBS) {
+ System.out.println(itemTB);
//00浠ｈ〃鏂板
if (itemTB.getFlag().equals("00")) {
erpItemSchedulerMS.addToMainDatabase(itemTB);
@@ -55,12 +54,6 @@
*/
//灏嗘暟鎹粠涓昏〃绉诲姩鍒癰ak琛ㄩ噷
private void moveToBak(ItemTB itemTB) {
-// ItemTBBak itemTBBak = new ItemTBBak();
-// BeanUtils.copyProperties(itemTB, itemTBBak);
-// itemTBBak.setDelDate(new Date());
-// erpItemTBBakMapper.insert(itemTBBak);
erpSqlServer.update("delete from erp_ItemTB where LKName='涓壃浜屾湡' and ItemId = '" + itemTB.getItemId() + "'");
-// erpItemTBMapper.delete(new EntityWrapper<ItemTB>()
-// .eq("ItemId",itemTB.getItemID()));
}
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
index 06099e3..c4b1f0b 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -3,6 +3,7 @@
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.third.erp.entity.InDetTB;
import com.zy.third.erp.entity.InHedTB;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
@@ -15,7 +16,7 @@
/**
* 鍏ュ簱鍗曟嵁
- */
+ */@Slf4j
@Component
public class ERPOutHedTBScheduler {
@@ -31,12 +32,14 @@
private ErpSqlServer erpSqlServer;
@Scheduled(cron = "${erp.refreshtime}")
- public void ItemScheduler() {
+ public void OutHedTBScheduler() {
+ log.info("OutHedTBScheduler寮�濮嬩簡");
if (!erpEnabled) return;
String sqlInHed = "select * from erp_OutHedTB where LKName='涓壃浜屾湡'";
List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class);
if (inHeds.size() > 0) {
for (InHedTB inHed : inHeds) {
+ System.out.println(inHed);
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + inHed.getBillNo() + "'");
List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
diff --git a/src/main/java/com/zy/third/lk/entity/InCancelTB.java b/src/main/java/com/zy/third/lk/entity/InCancelTB.java
index d925142..b824137 100644
--- a/src/main/java/com/zy/third/lk/entity/InCancelTB.java
+++ b/src/main/java/com/zy/third/lk/entity/InCancelTB.java
@@ -1,13 +1,16 @@
package com.zy.third.lk.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -15,6 +18,7 @@
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -24,73 +28,31 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "AutoId", type = IdType.AUTO)
private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "BillNo", type = IdType.INPUT)
@TableField(value = "BillNo")
private String BillNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("opFlag")
private Integer opFlag;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("MakeDate")
private Date MakeDate;
-
-
-// InCancelTB inCancelTB = new InCancelTB(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, //
-// null //
-// );
-
- public Integer getAutoId() {
- return AutoId;
- }
-
- public void setAutoId(Integer AutoId) {
- this.AutoId = AutoId;
- }
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public Integer getOpFlag() {
- return opFlag;
- }
-
- public void setOpFlag(Integer opFlag) {
- this.opFlag = opFlag;
- }
-
- 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;
- }
-
}
diff --git a/src/main/java/com/zy/third/lk/entity/InDetTB.java b/src/main/java/com/zy/third/lk/entity/InDetTB.java
index d74bfc9..8167f18 100644
--- a/src/main/java/com/zy/third/lk/entity/InDetTB.java
+++ b/src/main/java/com/zy/third/lk/entity/InDetTB.java
@@ -1,7 +1,8 @@
package com.zy.third.lk.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
@@ -12,8 +13,10 @@
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -25,6 +28,7 @@
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@NoArgsConstructor
@@ -36,48 +40,48 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("BillNo")
private String BillNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("iNo")
private Integer iNO;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("DetId")
private Integer detId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemId")
- private String itemid;
+ private String ItemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemCode")
private String ItemCode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemBatch")
private String ItemBatch;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("proType")
private String protype;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("OrderNo")
private String OrderNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("MainNum")
private Double MainNum;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("remark")
private String remark;
@@ -87,156 +91,26 @@
@TableField("WareName")
private String wareName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String temp1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String temp2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String temp3;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("MakeDate")
private Date makedate;
-
-// InDetTB inDetTB = new InDetTB(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// 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;
}
diff --git a/src/main/java/com/zy/third/lk/entity/InHedTB.java b/src/main/java/com/zy/third/lk/entity/InHedTB.java
index c46d034..e239035 100644
--- a/src/main/java/com/zy/third/lk/entity/InHedTB.java
+++ b/src/main/java/com/zy/third/lk/entity/InHedTB.java
@@ -1,14 +1,17 @@
package com.zy.third.lk.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -20,6 +23,7 @@
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@NoArgsConstructor
@@ -30,27 +34,26 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "BillNo", type = IdType.INPUT)
@TableField("BillNo")
private String BillNo;
@TableField("BillDate")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date billDate;
/**
* StockIn:閲囪喘鍏ュ簱
-ProductIn:OutHedTB
-ItemMoveIn:璋冩嫧鍏ュ簱
-ItemSwitchIn:褰㈡�佽浆鎹㈠叆搴�
-CheckMoreIn:鐩樼泩鍏ュ簱鍗�
-
+ * ProductIn:OutHedTB
+ * ItemMoveIn:璋冩嫧鍏ュ簱
+ * ItemSwitchIn:褰㈡�佽浆鎹㈠叆搴�
+ * CheckMoreIn:鐩樼泩鍏ュ簱鍗�
*/
- @ApiModelProperty(value= "StockIn:閲囪喘鍏ュ簱 ")
+ @ApiModelProperty(value = "StockIn:閲囪喘鍏ュ簱 ")
@TableField("IoKindID")
private String IoKindID;
@@ -61,42 +64,42 @@
/**
* 渚涘簲鍟嗐�侀儴闂↖D
*/
- @ApiModelProperty(value= "渚涘簲鍟嗐�侀儴闂↖D")
+ @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂↖D")
@TableField("ObjectId")
- private String OjectId;
+ private String ObjectId;
/**
* 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
+ @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
@TableField("ObjectName")
- private String OjbectName;
+ private String ObjectName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Remark")
- private String remark;
+ private String Remark;
@TableField("WareId")
- private String wareId;
+ private String WareId;
@TableField("WareName")
private String wareName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Temp1")
- private String temp1;
+ private String Temp1;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Temp2")
- private String temp2;
+ private String Temp2;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Temp3")
- private String temp3;
+ private String Temp3;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("MakeDate")
private Date makedate;
@@ -107,100 +110,11 @@
private Boolean bStartIn;
-
-
-
-// InHedTB inHedTB = new InHedTB(
-// null, // [闈炵┖]
-// null, // StockIn:閲囪喘鍏ュ簱
-
-
-// null, // 渚涘簲鍟嗐�侀儴闂↖D
-// null, // 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public String getIoKindID() {
- return IoKindID;
- }
-
- public void setIoKindID(String IoKindID) {
- this.IoKindID = IoKindID;
- }
-
- public String getOjectId() {
- return OjectId;
- }
-
- public void setOjectId(String OjectId) {
- this.OjectId = OjectId;
- }
-
- public String getOjbectName() {
- return OjbectName;
- }
-
- public void setOjbectName(String OjbectName) {
- this.OjbectName = OjbectName;
- }
-
- 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;
}
diff --git a/src/main/java/com/zy/third/lk/entity/OutDetTB.java b/src/main/java/com/zy/third/lk/entity/OutDetTB.java
index 01302c4..fffa5d1 100644
--- a/src/main/java/com/zy/third/lk/entity/OutDetTB.java
+++ b/src/main/java/com/zy/third/lk/entity/OutDetTB.java
@@ -1,7 +1,8 @@
package com.zy.third.lk.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
@@ -14,6 +15,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -24,212 +26,80 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("BillNo")
private String BillNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("iNo")
private Integer iNO;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("DetId")
private Integer detId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemId")
private String itemid;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemCode")
private String ItemCode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemBatch")
private String ItemBatch;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("proType")
private String protype;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("OrderNo")
private String OrderNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("MainNum")
private Double MainNum;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("remark")
private String remark;
@TableField("WareId")
- private String wareId;
+ private String WareId;
@TableField("WareName")
- private String wareName;
+ private String WareName;
- @ApiModelProperty(value= "")
- private String temp1;
+ @ApiModelProperty(value = "")
+ private String Temp1;
- @ApiModelProperty(value= "")
- private String temp2;
+ @ApiModelProperty(value = "")
+ private String Temp2;
- @ApiModelProperty(value= "")
- private String temp3;
+ @ApiModelProperty(value = "")
+ private String Temp3;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("MakeDate")
private Date makedate;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("DelDate")
private Date delDate;
-
-// OutDetTb outDetTb = new OutDetTb(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// 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;
}
diff --git a/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java b/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
index 758c9ee..a3138d6 100644
--- a/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
@@ -1,7 +1,8 @@
package com.zy.third.lk.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
@@ -11,6 +12,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@TableName("lk_OutDetTb_bak")
@@ -18,217 +20,79 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoID;
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
- @ApiModelProperty(value= "")
- @TableField("BillNo")
+ @ApiModelProperty(value = "")
+ @TableField("BillNo")
private String BillNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("iNo")
private Integer iNO;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("DetId")
private Integer detId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemId")
private String itemid;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemCode")
private String ItemCode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemBatch")
private String ItemBatch;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("proType")
private String protype;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("OrderNo")
private String OrderNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("MainNum")
private Double MainNum;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("remark")
private String remark;
@TableField("WareId")
- private String wareId;
+ private String WareId;
@TableField("WareName")
- private String wareName;
+ private String WareName;
- @ApiModelProperty(value= "")
- private String temp1;
+ @ApiModelProperty(value = "")
+ private String Temp1;
- @ApiModelProperty(value= "")
- private String temp2;
+ @ApiModelProperty(value = "")
+ private String Temp2;
- @ApiModelProperty(value= "")
- private String temp3;
+ @ApiModelProperty(value = "")
+ private String Temp3;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("MakeDate")
private Date makedate;
@TableField("DelDate")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date delDate;
-
-
- public OutDetTBBak() {}
-
-
-
-// OutDetTbBak outDetTbBak = new OutDetTbBak(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// 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;
}
diff --git a/src/main/java/com/zy/third/lk/entity/OutHedTB.java b/src/main/java/com/zy/third/lk/entity/OutHedTB.java
index d708c69..f9a352a 100644
--- a/src/main/java/com/zy/third/lk/entity/OutHedTB.java
+++ b/src/main/java/com/zy/third/lk/entity/OutHedTB.java
@@ -1,7 +1,8 @@
package com.zy.third.lk.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
@@ -14,6 +15,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -24,42 +26,41 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "BillNo", type = IdType.INPUT)
@TableField("BillNo")
private String BillNo;
@TableField("BillDate")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date billDate;
/**
* SendMatOut:鍙戞枡鍑哄簱
-OtherOut:鍏跺畠鍑哄簱鍗�
-ItemMoveOut:璋冩嫧鍑哄簱
-ItemSwitchOut:褰㈡�佽浆鎹㈠嚭搴�
-CheckLossOut:鐩樼泩鍑哄簱鍗�
-
+ * OtherOut:鍏跺畠鍑哄簱鍗�
+ * ItemMoveOut:璋冩嫧鍑哄簱
+ * ItemSwitchOut:褰㈡�佽浆鎹㈠嚭搴�
+ * CheckLossOut:鐩樼泩鍑哄簱鍗�
*/
- @ApiModelProperty(value= "SendMatOut:鍙戞枡鍑哄簱 ")
+ @ApiModelProperty(value = "SendMatOut:鍙戞枡鍑哄簱 ")
@TableField("IoKindID")
private String IoKindID;
@TableField("IoKindName")
private String ioKindName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ObjectId")
- private String OjectId;
+ private String ObjectId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ObjectName")
- private String OjbectName;
+ private String ObjectName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Remark")
private String remark;
@@ -69,21 +70,21 @@
@TableField("WareName")
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")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("MakeDate")
private Date makedate;
@@ -95,96 +96,11 @@
private Boolean bStartIn;
-// OutHedTb outHedTb = new OutHedTb(
-// null, // [闈炵┖]
-// null, // SendMatOut:鍙戞枡鍑哄簱
-
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public String getIoKindID() {
- return IoKindID;
- }
-
- public void setIoKindID(String IoKindID) {
- this.IoKindID = IoKindID;
- }
-
- public String getOjectId() {
- return OjectId;
- }
-
- public void setOjectId(String OjectId) {
- this.OjectId = OjectId;
- }
-
- public String getOjbectName() {
- return OjbectName;
- }
-
- public void setOjbectName(String OjbectName) {
- this.OjbectName = OjbectName;
- }
-
- 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;
}
diff --git a/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
index 4d967bf..69dd714 100644
--- a/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
@@ -19,7 +19,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "AutoId",type = IdType.AUTO)
- private Integer autoId;
+ private Integer AutoId;
@ApiModelProperty(value= "")
@TableField("BillNo")
@@ -45,33 +45,33 @@
@ApiModelProperty(value= "")
@TableField("ObjectId")
- private String OjectId;
+ private String ObjectId;
@ApiModelProperty(value= "")
@TableField("ObjectName")
- private String OjbectName;
+ private String ObjectName;
@ApiModelProperty(value= "")
@TableField("Remark")
- private String remark;
+ private String Remark;
@TableField("WareId")
- private String wareId;
+ private String WareId;
@TableField("WareName")
- private String wareName;
+ private String WareName;
@ApiModelProperty(value= "")
@TableField("Temp1")
- private String temp1;
+ private String Temp1;
@ApiModelProperty(value= "")
@TableField("Temp2")
- private String temp2;
+ private String Temp2;
@ApiModelProperty(value= "")
@TableField("Temp3")
- private String temp3;
+ private String Temp3;
@ApiModelProperty(value= "")
@@ -89,69 +89,6 @@
private Boolean bStartIn;
- public OutHedTBBak() {}
-
- public OutHedTBBak(String BillNo, String IoKindID, String OjectId, String OjbectName, Date makedate, String remark, String temp1, String temp2, String temp3) {
- this.BillNo = BillNo;
- this.IoKindID = IoKindID;
- this.OjectId = OjectId;
- this.OjbectName = OjbectName;
- this.makedate = makedate;
- this.remark = remark;
- this.temp1 = temp1;
- this.temp2 = temp2;
- this.temp3 = temp3;
- }
-
-// OutHedTbBak outHedTbBak = new OutHedTbBak(
-// null, // [闈炵┖]
-// null, // SendMatOut:鍙戞枡鍑哄簱
-
-
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- public String getBillNo() {
- return BillNo;
- }
-
- public void setBillNo(String BillNo) {
- this.BillNo = BillNo;
- }
-
- public String getIoKindID() {
- return IoKindID;
- }
-
- public void setIoKindID(String IoKindID) {
- this.IoKindID = IoKindID;
- }
-
- public String getOjectId() {
- return OjectId;
- }
-
- public void setOjectId(String OjectId) {
- this.OjectId = OjectId;
- }
-
- public String getOjbectName() {
- return OjbectName;
- }
-
- public void setOjbectName(String OjbectName) {
- this.OjbectName = OjbectName;
- }
-
- public Date getMakedate() {
- return makedate;
- }
public String getMakedate$(){
if (Cools.isEmpty(this.makedate)){
@@ -160,41 +97,7 @@
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;
- }
}
diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
index 8da3ca0..d118af8 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -51,10 +51,12 @@
@Transactional
@Scheduled(cron = "${erp.refreshtime}")
public void pakinOrderComplete() {
+ log.info("寮�濮嬪叆搴撴洿鏂板畬鎴愬洖鎶�");
// 鎵�鏈夎鍗�
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
DocType docType;
for (Order order : orders) {
+ System.out.println(order);
docType = docTypeService.selectById(order.getDocType());
if (docType == null) {
log.error("璇ヨ鍗曠被鍨嬩笉瀛樺湪:" + order.getDocType());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 348bae0..62c0926 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -108,6 +108,6 @@
refreshtime: 0/5 * * * * ?
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=XDLinkLK
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=XDLinkLK2
username: sa
password: sa@123
--
Gitblit v1.9.1