From 1f75b59680589aa2c5831ddfbe8255e0eab84fe8 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 03 一月 2023 15:38:39 +0800
Subject: [PATCH] #中间表对接
---
src/main/java/com/zy/ints/entity/PrdtBak.java | 79 +++++
src/main/java/com/zy/ints/entity/LkDetTb.java | 60 ++-
src/main/java/com/zy/ints/entity/ErpDetTb.java | 58 ++-
src/main/java/com/zy/ints/entity/Prdt.java | 20
src/main/java/com/zy/ints/erp/ErpSqlServer.java | 71 ++--
src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 128 ++++----
src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 41 ++
src/main/java/com/zy/ints/entity/ErpLkBak.java | 97 ++++++
src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 57 ++++
src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java | 57 ++++
src/main/java/com/zy/ints/entity/ErpLk.java | 24
src/main/java/com/zy/ints/entity/LkDetTbBak.java | 60 ++-
src/main/java/com/zy/ints/entity/ErpDetTbBak.java | 60 ++-
13 files changed, 592 insertions(+), 220 deletions(-)
diff --git a/src/main/java/com/zy/ints/entity/DetTb.java b/src/main/java/com/zy/ints/entity/ErpDetTb.java
similarity index 67%
copy from src/main/java/com/zy/ints/entity/DetTb.java
copy to src/main/java/com/zy/ints/entity/ErpDetTb.java
index 4c901c5..c75edc0 100644
--- a/src/main/java/com/zy/ints/entity/DetTb.java
+++ b/src/main/java/com/zy/ints/entity/ErpDetTb.java
@@ -1,27 +1,28 @@
package com.zy.ints.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 java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
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("erp_det_tb")
-public class DetTb implements Serializable {
+public class ErpDetTb implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 鍗曟嵁鍙风爜
*/
- @ApiModelProperty(value= "鍗曟嵁鍙风爜")
+ @ApiModelProperty(value = "鍗曟嵁鍙风爜")
@TableId(value = "bill_no", type = IdType.INPUT)
@TableField("bill_no")
private String billNo;
@@ -29,7 +30,7 @@
/**
* 鍝佸彿
*/
- @ApiModelProperty(value= "鍝佸彿")
+ @ApiModelProperty(value = "鍝佸彿")
@TableId(value = "prd_no", type = IdType.INPUT)
@TableField("prd_no")
private String prdNo;
@@ -37,26 +38,32 @@
/**
* 鍗曟嵁绫诲埆
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲埆")
+ @ApiModelProperty(value = "鍗曟嵁绫诲埆:" +
+ "TF_PSS:閲囪喘閿�鍞甛n" +
+ "TF_IC:搴撳瓨璋冩嫧\n" +
+ "TF_IJ:搴撳瓨璋冩暣\n" +
+ "TF_ML:鐢熶骇棰嗘枡\n" +
+ "TF_MM0:鐢熶骇缂村簱\n" +
+ "TF_TC:鎵樺伐閫�鍥�")
private String iokindid;
/**
* 澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級
*/
- @ApiModelProperty(value= "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級")
+ @ApiModelProperty(value = "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級")
@TableField("add_id")
private String addId;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double qty;
/**
* 璐у搧鐗瑰緛
*/
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
+ @ApiModelProperty(value = "璐у搧鐗瑰緛")
@TableId(value = "prd_mark", type = IdType.INPUT)
@TableField("prd_mark")
private String prdMark;
@@ -64,43 +71,44 @@
/**
* 浠撳簱
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value = "浠撳簱")
private String wh;
/**
* 鏃ユ湡
*/
- @ApiModelProperty(value= "鏃ユ湡")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date billdate;
/**
* 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級
*/
- @ApiModelProperty(value= "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
+ @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
private Integer status;
/**
* 澶囩敤瀛楁1
*/
- @ApiModelProperty(value= "澶囩敤瀛楁1")
+ @ApiModelProperty(value = "澶囩敤瀛楁1")
private String temp1;
/**
* 澶囩敤瀛楁2
*/
- @ApiModelProperty(value= "澶囩敤瀛楁2")
+ @ApiModelProperty(value = "澶囩敤瀛楁2")
private String temp2;
/**
* 澶囩敤瀛楁3
*/
- @ApiModelProperty(value= "澶囩敤瀛楁3")
+ @ApiModelProperty(value = "澶囩敤瀛楁3")
private String temp3;
- public DetTb() {}
+ public ErpDetTb() {
+ }
- public DetTb(String billNo,String prdNo,String iokindid,String addId,Double qty,String prdMark,String wh,Date billdate,Integer status,String temp1,String temp2,String temp3) {
+ public ErpDetTb(String billNo, String prdNo, String iokindid, String addId, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) {
this.billNo = billNo;
this.prdNo = prdNo;
this.iokindid = iokindid;
@@ -131,8 +139,8 @@
// null // 澶囩敤瀛楁3
// );
- public String getBilldate$(){
- if (Cools.isEmpty(this.billdate)){
+ public String getBilldate$() {
+ if (Cools.isEmpty(this.billdate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate);
diff --git a/src/main/java/com/zy/ints/entity/DetTb.java b/src/main/java/com/zy/ints/entity/ErpDetTbBak.java
similarity index 66%
copy from src/main/java/com/zy/ints/entity/DetTb.java
copy to src/main/java/com/zy/ints/entity/ErpDetTbBak.java
index 4c901c5..4f7bec3 100644
--- a/src/main/java/com/zy/ints/entity/DetTb.java
+++ b/src/main/java/com/zy/ints/entity/ErpDetTbBak.java
@@ -1,27 +1,28 @@
package com.zy.ints.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 java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
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("erp_det_tb")
-public class DetTb implements Serializable {
+@TableName("erp_det_tb_bak")
+public class ErpDetTbBak implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 鍗曟嵁鍙风爜
*/
- @ApiModelProperty(value= "鍗曟嵁鍙风爜")
+ @ApiModelProperty(value = "鍗曟嵁鍙风爜")
@TableId(value = "bill_no", type = IdType.INPUT)
@TableField("bill_no")
private String billNo;
@@ -29,7 +30,7 @@
/**
* 鍝佸彿
*/
- @ApiModelProperty(value= "鍝佸彿")
+ @ApiModelProperty(value = "鍝佸彿")
@TableId(value = "prd_no", type = IdType.INPUT)
@TableField("prd_no")
private String prdNo;
@@ -37,26 +38,32 @@
/**
* 鍗曟嵁绫诲埆
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲埆")
+ @ApiModelProperty(value = "鍗曟嵁绫诲埆:" +
+ "TF_PSS:閲囪喘閿�鍞甛n" +
+ "TF_IC:搴撳瓨璋冩嫧\n" +
+ "TF_IJ:搴撳瓨璋冩暣\n" +
+ "TF_ML:鐢熶骇棰嗘枡\n" +
+ "TF_MM0:鐢熶骇缂村簱\n" +
+ "TF_TC:鎵樺伐閫�鍥�")
private String iokindid;
/**
* 澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級
*/
- @ApiModelProperty(value= "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級")
+ @ApiModelProperty(value = "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級")
@TableField("add_id")
private String addId;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double qty;
/**
* 璐у搧鐗瑰緛
*/
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
+ @ApiModelProperty(value = "璐у搧鐗瑰緛")
@TableId(value = "prd_mark", type = IdType.INPUT)
@TableField("prd_mark")
private String prdMark;
@@ -64,43 +71,44 @@
/**
* 浠撳簱
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value = "浠撳簱")
private String wh;
/**
* 鏃ユ湡
*/
- @ApiModelProperty(value= "鏃ユ湡")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date billdate;
/**
* 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級
*/
- @ApiModelProperty(value= "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
+ @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
private Integer status;
/**
* 澶囩敤瀛楁1
*/
- @ApiModelProperty(value= "澶囩敤瀛楁1")
+ @ApiModelProperty(value = "澶囩敤瀛楁1")
private String temp1;
/**
* 澶囩敤瀛楁2
*/
- @ApiModelProperty(value= "澶囩敤瀛楁2")
+ @ApiModelProperty(value = "澶囩敤瀛楁2")
private String temp2;
/**
* 澶囩敤瀛楁3
*/
- @ApiModelProperty(value= "澶囩敤瀛楁3")
+ @ApiModelProperty(value = "澶囩敤瀛楁3")
private String temp3;
- public DetTb() {}
+ public ErpDetTbBak() {
+ }
- public DetTb(String billNo,String prdNo,String iokindid,String addId,Double qty,String prdMark,String wh,Date billdate,Integer status,String temp1,String temp2,String temp3) {
+ public ErpDetTbBak(String billNo, String prdNo, String iokindid, String addId, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) {
this.billNo = billNo;
this.prdNo = prdNo;
this.iokindid = iokindid;
@@ -131,8 +139,8 @@
// null // 澶囩敤瀛楁3
// );
- public String getBilldate$(){
- if (Cools.isEmpty(this.billdate)){
+ public String getBilldate$() {
+ if (Cools.isEmpty(this.billdate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate);
diff --git a/src/main/java/com/zy/ints/entity/ErpLk.java b/src/main/java/com/zy/ints/entity/ErpLk.java
index 31cffe7..6fd3600 100644
--- a/src/main/java/com/zy/ints/entity/ErpLk.java
+++ b/src/main/java/com/zy/ints/entity/ErpLk.java
@@ -1,12 +1,13 @@
package com.zy.ints.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -18,7 +19,7 @@
/**
* 鍝佸彿
*/
- @ApiModelProperty(value= "鍝佸彿")
+ @ApiModelProperty(value = "鍝佸彿")
@TableId(value = "prd_no", type = IdType.INPUT)
@TableField("prd_no")
private String prdNo;
@@ -26,7 +27,7 @@
/**
* 璐у搧鐗瑰緛
*/
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
+ @ApiModelProperty(value = "璐у搧鐗瑰緛")
@TableId(value = "prd_mark", type = IdType.INPUT)
@TableField("prd_mark")
private String prdMark;
@@ -34,42 +35,43 @@
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double qty;
/**
* 浠撳簱
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value = "浠撳簱")
private String wh;
/**
* 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級
*/
- @ApiModelProperty(value= "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
+ @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
private Integer status;
/**
* 澶囩敤瀛楁1
*/
- @ApiModelProperty(value= "澶囩敤瀛楁1")
+ @ApiModelProperty(value = "澶囩敤瀛楁1")
private String temp1;
/**
* 澶囩敤瀛楁2
*/
- @ApiModelProperty(value= "澶囩敤瀛楁2")
+ @ApiModelProperty(value = "澶囩敤瀛楁2")
private String temp2;
/**
* 澶囩敤瀛楁3
*/
- @ApiModelProperty(value= "澶囩敤瀛楁3")
+ @ApiModelProperty(value = "澶囩敤瀛楁3")
private String temp3;
- public ErpLk() {}
+ public ErpLk() {
+ }
- public ErpLk(String prdNo,String prdMark,Double qty,String wh,Integer status,String temp1,String temp2,String temp3) {
+ public ErpLk(String prdNo, String prdMark, Double qty, String wh, Integer status, String temp1, String temp2, String temp3) {
this.prdNo = prdNo;
this.prdMark = prdMark;
this.qty = qty;
diff --git a/src/main/java/com/zy/ints/entity/ErpLkBak.java b/src/main/java/com/zy/ints/entity/ErpLkBak.java
new file mode 100644
index 0000000..95198a1
--- /dev/null
+++ b/src/main/java/com/zy/ints/entity/ErpLkBak.java
@@ -0,0 +1,97 @@
+package com.zy.ints.entity;
+
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("bas_erp_lk_bak")
+public class ErpLkBak implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鍝佸彿
+ */
+ @ApiModelProperty(value = "鍝佸彿")
+ @TableId(value = "prd_no", type = IdType.INPUT)
+ @TableField("prd_no")
+ private String prdNo;
+
+ /**
+ * 璐у搧鐗瑰緛
+ */
+ @ApiModelProperty(value = "璐у搧鐗瑰緛")
+ @TableId(value = "prd_mark", type = IdType.INPUT)
+ @TableField("prd_mark")
+ private String prdMark;
+
+ /**
+ * 鏁伴噺
+ */
+ @ApiModelProperty(value = "鏁伴噺")
+ private Double qty;
+
+ /**
+ * 浠撳簱
+ */
+ @ApiModelProperty(value = "浠撳簱")
+ private String wh;
+
+ /**
+ * 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級
+ */
+ @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
+ private Integer status;
+
+ /**
+ * 澶囩敤瀛楁1
+ */
+ @ApiModelProperty(value = "澶囩敤瀛楁1")
+ private String temp1;
+
+ /**
+ * 澶囩敤瀛楁2
+ */
+ @ApiModelProperty(value = "澶囩敤瀛楁2")
+ private String temp2;
+
+ /**
+ * 澶囩敤瀛楁3
+ */
+ @ApiModelProperty(value = "澶囩敤瀛楁3")
+ private String temp3;
+
+ public ErpLkBak() {
+ }
+
+ public ErpLkBak(String prdNo, String prdMark, Double qty, String wh, Integer status, String temp1, String temp2, String temp3) {
+ this.prdNo = prdNo;
+ this.prdMark = prdMark;
+ this.qty = qty;
+ this.wh = wh;
+ this.status = status;
+ this.temp1 = temp1;
+ this.temp2 = temp2;
+ this.temp3 = temp3;
+ }
+
+// ErpLk erpLk = new ErpLk(
+// null, // id[闈炵┖]
+// null, // 鍝佸彿[闈炵┖]
+// null, // 璐у搧鐗瑰緛[闈炵┖]
+// null, // 鏁伴噺[闈炵┖]
+// null, // 浠撳簱
+// null, // 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級[闈炵┖]
+// null, // 澶囩敤瀛楁1
+// null, // 澶囩敤瀛楁2
+// null // 澶囩敤瀛楁3
+// );
+
+
+}
diff --git a/src/main/java/com/zy/ints/entity/DetTb.java b/src/main/java/com/zy/ints/entity/LkDetTb.java
similarity index 67%
rename from src/main/java/com/zy/ints/entity/DetTb.java
rename to src/main/java/com/zy/ints/entity/LkDetTb.java
index 4c901c5..8d67e07 100644
--- a/src/main/java/com/zy/ints/entity/DetTb.java
+++ b/src/main/java/com/zy/ints/entity/LkDetTb.java
@@ -1,27 +1,28 @@
package com.zy.ints.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 java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
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("erp_det_tb")
-public class DetTb implements Serializable {
+@TableName("lk_det_tb")
+public class LkDetTb implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 鍗曟嵁鍙风爜
*/
- @ApiModelProperty(value= "鍗曟嵁鍙风爜")
+ @ApiModelProperty(value = "鍗曟嵁鍙风爜")
@TableId(value = "bill_no", type = IdType.INPUT)
@TableField("bill_no")
private String billNo;
@@ -29,7 +30,7 @@
/**
* 鍝佸彿
*/
- @ApiModelProperty(value= "鍝佸彿")
+ @ApiModelProperty(value = "鍝佸彿")
@TableId(value = "prd_no", type = IdType.INPUT)
@TableField("prd_no")
private String prdNo;
@@ -37,26 +38,32 @@
/**
* 鍗曟嵁绫诲埆
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲埆")
+ @ApiModelProperty(value = "鍗曟嵁绫诲埆:" +
+ "TF_PSS:閲囪喘閿�鍞甛n" +
+ "TF_IC:搴撳瓨璋冩嫧\n" +
+ "TF_IJ:搴撳瓨璋冩暣\n" +
+ "TF_ML:鐢熶骇棰嗘枡\n" +
+ "TF_MM0:鐢熶骇缂村簱\n" +
+ "TF_TC:鎵樺伐閫�鍥�")
private String iokindid;
/**
* 澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級
*/
- @ApiModelProperty(value= "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級")
+ @ApiModelProperty(value = "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級")
@TableField("add_id")
private String addId;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double qty;
/**
* 璐у搧鐗瑰緛
*/
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
+ @ApiModelProperty(value = "璐у搧鐗瑰緛")
@TableId(value = "prd_mark", type = IdType.INPUT)
@TableField("prd_mark")
private String prdMark;
@@ -64,43 +71,44 @@
/**
* 浠撳簱
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value = "浠撳簱")
private String wh;
/**
* 鏃ユ湡
*/
- @ApiModelProperty(value= "鏃ユ湡")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date billdate;
/**
* 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級
*/
- @ApiModelProperty(value= "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
+ @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
private Integer status;
/**
* 澶囩敤瀛楁1
*/
- @ApiModelProperty(value= "澶囩敤瀛楁1")
+ @ApiModelProperty(value = "澶囩敤瀛楁1")
private String temp1;
/**
* 澶囩敤瀛楁2
*/
- @ApiModelProperty(value= "澶囩敤瀛楁2")
+ @ApiModelProperty(value = "澶囩敤瀛楁2")
private String temp2;
/**
* 澶囩敤瀛楁3
*/
- @ApiModelProperty(value= "澶囩敤瀛楁3")
+ @ApiModelProperty(value = "澶囩敤瀛楁3")
private String temp3;
- public DetTb() {}
+ public LkDetTb() {
+ }
- public DetTb(String billNo,String prdNo,String iokindid,String addId,Double qty,String prdMark,String wh,Date billdate,Integer status,String temp1,String temp2,String temp3) {
+ public LkDetTb(String billNo, String prdNo, String iokindid, String addId, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) {
this.billNo = billNo;
this.prdNo = prdNo;
this.iokindid = iokindid;
@@ -131,8 +139,8 @@
// null // 澶囩敤瀛楁3
// );
- public String getBilldate$(){
- if (Cools.isEmpty(this.billdate)){
+ public String getBilldate$() {
+ if (Cools.isEmpty(this.billdate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate);
diff --git a/src/main/java/com/zy/ints/entity/DetTb.java b/src/main/java/com/zy/ints/entity/LkDetTbBak.java
similarity index 66%
copy from src/main/java/com/zy/ints/entity/DetTb.java
copy to src/main/java/com/zy/ints/entity/LkDetTbBak.java
index 4c901c5..fe9be8c 100644
--- a/src/main/java/com/zy/ints/entity/DetTb.java
+++ b/src/main/java/com/zy/ints/entity/LkDetTbBak.java
@@ -1,27 +1,28 @@
package com.zy.ints.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 java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
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("erp_det_tb")
-public class DetTb implements Serializable {
+@TableName("lk_det_tb_bak")
+public class LkDetTbBak implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 鍗曟嵁鍙风爜
*/
- @ApiModelProperty(value= "鍗曟嵁鍙风爜")
+ @ApiModelProperty(value = "鍗曟嵁鍙风爜")
@TableId(value = "bill_no", type = IdType.INPUT)
@TableField("bill_no")
private String billNo;
@@ -29,7 +30,7 @@
/**
* 鍝佸彿
*/
- @ApiModelProperty(value= "鍝佸彿")
+ @ApiModelProperty(value = "鍝佸彿")
@TableId(value = "prd_no", type = IdType.INPUT)
@TableField("prd_no")
private String prdNo;
@@ -37,26 +38,32 @@
/**
* 鍗曟嵁绫诲埆
*/
- @ApiModelProperty(value= "鍗曟嵁绫诲埆")
+ @ApiModelProperty(value = "鍗曟嵁绫诲埆:" +
+ "TF_PSS:閲囪喘閿�鍞甛n" +
+ "TF_IC:搴撳瓨璋冩嫧\n" +
+ "TF_IJ:搴撳瓨璋冩暣\n" +
+ "TF_ML:鐢熶骇棰嗘枡\n" +
+ "TF_MM0:鐢熶骇缂村簱\n" +
+ "TF_TC:鎵樺伐閫�鍥�")
private String iokindid;
/**
* 澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級
*/
- @ApiModelProperty(value= "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級")
+ @ApiModelProperty(value = "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級")
@TableField("add_id")
private String addId;
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double qty;
/**
* 璐у搧鐗瑰緛
*/
- @ApiModelProperty(value= "璐у搧鐗瑰緛")
+ @ApiModelProperty(value = "璐у搧鐗瑰緛")
@TableId(value = "prd_mark", type = IdType.INPUT)
@TableField("prd_mark")
private String prdMark;
@@ -64,43 +71,44 @@
/**
* 浠撳簱
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value = "浠撳簱")
private String wh;
/**
* 鏃ユ湡
*/
- @ApiModelProperty(value= "鏃ユ湡")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date billdate;
/**
* 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級
*/
- @ApiModelProperty(value= "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
+ @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級")
private Integer status;
/**
* 澶囩敤瀛楁1
*/
- @ApiModelProperty(value= "澶囩敤瀛楁1")
+ @ApiModelProperty(value = "澶囩敤瀛楁1")
private String temp1;
/**
* 澶囩敤瀛楁2
*/
- @ApiModelProperty(value= "澶囩敤瀛楁2")
+ @ApiModelProperty(value = "澶囩敤瀛楁2")
private String temp2;
/**
* 澶囩敤瀛楁3
*/
- @ApiModelProperty(value= "澶囩敤瀛楁3")
+ @ApiModelProperty(value = "澶囩敤瀛楁3")
private String temp3;
- public DetTb() {}
+ public LkDetTbBak() {
+ }
- public DetTb(String billNo,String prdNo,String iokindid,String addId,Double qty,String prdMark,String wh,Date billdate,Integer status,String temp1,String temp2,String temp3) {
+ public LkDetTbBak(String billNo, String prdNo, String iokindid, String addId, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) {
this.billNo = billNo;
this.prdNo = prdNo;
this.iokindid = iokindid;
@@ -131,8 +139,8 @@
// null // 澶囩敤瀛楁3
// );
- public String getBilldate$(){
- if (Cools.isEmpty(this.billdate)){
+ public String getBilldate$() {
+ if (Cools.isEmpty(this.billdate)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate);
diff --git a/src/main/java/com/zy/ints/entity/Prdt.java b/src/main/java/com/zy/ints/entity/Prdt.java
index 5f65135..03c8766 100644
--- a/src/main/java/com/zy/ints/entity/Prdt.java
+++ b/src/main/java/com/zy/ints/entity/Prdt.java
@@ -1,12 +1,13 @@
package com.zy.ints.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
+
import java.io.Serializable;
@Data
@@ -18,7 +19,7 @@
/**
* 鍝佸彿
*/
- @ApiModelProperty(value= "鍝佸彿")
+ @ApiModelProperty(value = "鍝佸彿")
@TableId(value = "prd_no", type = IdType.INPUT)
@TableField("prd_no")
private String prdNo;
@@ -26,36 +27,37 @@
/**
* 鍝佸悕
*/
- @ApiModelProperty(value= "鍝佸悕")
+ @ApiModelProperty(value = "鍝佸悕")
private String name;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String ut;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String spc;
/**
* 绫诲瀷
*/
- @ApiModelProperty(value= "绫诲瀷")
+ @ApiModelProperty(value = "绫诲瀷")
private Integer type;
/**
* 鐘舵��
*/
- @ApiModelProperty(value= "鐘舵��")
+ @ApiModelProperty(value = "鐘舵��")
private Integer status;
- public Prdt() {}
+ public Prdt() {
+ }
- public Prdt(String prdNo,String name,String ut,String spc,Integer type,Integer status) {
+ public Prdt(String prdNo, String name, String ut, String spc, Integer type, Integer status) {
this.prdNo = prdNo;
this.name = name;
this.ut = ut;
diff --git a/src/main/java/com/zy/ints/entity/PrdtBak.java b/src/main/java/com/zy/ints/entity/PrdtBak.java
new file mode 100644
index 0000000..3912120
--- /dev/null
+++ b/src/main/java/com/zy/ints/entity/PrdtBak.java
@@ -0,0 +1,79 @@
+package com.zy.ints.entity;
+
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@TableName("erp_prdt_bak")
+public class PrdtBak implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 鍝佸彿
+ */
+ @ApiModelProperty(value = "鍝佸彿")
+ @TableId(value = "prd_no", type = IdType.INPUT)
+ @TableField("prd_no")
+ private String prdNo;
+
+ /**
+ * 鍝佸悕
+ */
+ @ApiModelProperty(value = "鍝佸悕")
+ private String name;
+
+ /**
+ * 鍗曚綅
+ */
+ @ApiModelProperty(value = "鍗曚綅")
+ private String ut;
+
+ /**
+ * 瑙勬牸
+ */
+ @ApiModelProperty(value = "瑙勬牸")
+ private String spc;
+
+ /**
+ * 绫诲瀷
+ */
+ @ApiModelProperty(value = "绫诲瀷")
+ private Integer type;
+
+ /**
+ * 鐘舵��
+ */
+ @ApiModelProperty(value = "鐘舵��")
+ private Integer status;
+
+ public PrdtBak() {
+ }
+
+ public PrdtBak(String prdNo, String name, String ut, String spc, Integer type, Integer status) {
+ this.prdNo = prdNo;
+ this.name = name;
+ this.ut = ut;
+ this.spc = spc;
+ this.type = type;
+ this.status = status;
+ }
+
+// Prdt prdt = new Prdt(
+// null, // id[闈炵┖]
+// null, // 鍝佸彿[闈炵┖]
+// null, // 鍝佸悕[闈炵┖]
+// null, // 鍗曚綅
+// null, // 瑙勬牸
+// null, // 绫诲瀷[闈炵┖]
+// null // 鐘舵�乕闈炵┖]
+// );
+
+
+}
diff --git a/src/main/java/com/zy/ints/erp/ErpSqlServer.java b/src/main/java/com/zy/ints/erp/ErpSqlServer.java
index 78b7ed8..fc8b96b 100644
--- a/src/main/java/com/zy/ints/erp/ErpSqlServer.java
+++ b/src/main/java/com/zy/ints/erp/ErpSqlServer.java
@@ -26,7 +26,7 @@
@Slf4j
@Service
public class ErpSqlServer {
-
+
// 鏁版嵁搴撹繛鎺�
// private Connection conn;
// 鍒涘缓棰勭紪璇戣鍙ュ璞★紝涓�鑸兘鏄敤杩欎釜鑰屼笉鐢⊿tatement
@@ -54,17 +54,18 @@
}
return list;
}
-
-
+
+
/**
* 鎵弿鎵�鏈夊疄鍔涚被灞炴�ч噷鐨凾ableField娉ㄨВ,骞跺皢閲岄潰鐨勫�间綔涓篶olumn
+ *
* @param cls
* @param <T>
* @return
*/
- public <T> String selectFrontPart(Class<T> cls){
+ public <T> String selectFrontPart(Class<T> cls) {
String tableName = cls.getDeclaredAnnotation(TableName.class).value();
- List<HashMap<String,String>> columnAndField = new ArrayList<>();
+ List<HashMap<String, String>> columnAndField = new ArrayList<>();
String sql = "SELECT ";
if (Cools.isEmpty(tableName)) {
return null;
@@ -73,7 +74,7 @@
for (Field f : allFields) {
if (Modifier.isFinal(f.getModifiers())
|| Modifier.isStatic(f.getModifiers())
- || Modifier.isTransient(f.getModifiers())){
+ || Modifier.isTransient(f.getModifiers())) {
continue;
}
String column = null;
@@ -85,16 +86,16 @@
}
String name = f.getName();
HashMap<String, String> container = new HashMap<>();
- container.put(column,name);
+ container.put(column, name);
columnAndField.add(container);
}
for (int i = 0; i < columnAndField.size(); i++) {
HashMap<String, String> stringStringHashMap = columnAndField.get(i);
- if (i == columnAndField.size() - 1){
+ if (i == columnAndField.size() - 1) {
for (String s : stringStringHashMap.keySet()) {
sql = sql + s + " AS " + stringStringHashMap.get(s);
}
- }else {
+ } else {
for (String s : stringStringHashMap.keySet()) {
sql = sql + s + " AS " + stringStringHashMap.get(s) + ", ";
}
@@ -103,40 +104,41 @@
sql = sql + " FROM " + tableName;
return sql;
}
-
- public String addWhere(String sql, Map<String,String> condition){
+
+ public String addWhere(String sql, Map<String, String> condition) {
int conditionSize = 1;
sql = sql + " WHERE ";
for (String s : condition.keySet()) {
- if (conditionSize == condition.keySet().size()){
+ if (conditionSize == condition.keySet().size()) {
sql = sql + s + " = " + condition.get(s);
- }else {
+ } else {
sql = sql + s + " = " + condition.get(s) + " and ";
}
conditionSize = conditionSize + 1;
}
return sql;
}
-
+
/**
* map鐨勯敭鏄垪鍚�, 鍊肩瓑鍚屼簬鍊�
* key: id, value: 1 绛夊悓浜� WHERE id = 1
* 濡傛灉瑕佹煡璇㈠瓧绗︿覆闇�瑕佽嚜琛屽姞涓�''
* key:name, value: 'zhs'绛夊悓浜� WHERE name = 'zhs'
+ *
* @param cls
* @param condition
* @param <T>
* @return
*/
- public <T> List<T> selectList(Class<T> cls, Map<String,String> condition){
+ public <T> List<T> selectList(Class<T> cls, Map<String, String> condition) {
String sql = selectFrontPart(cls);
String finalSQL = addWhere(sql, condition);
- return select(finalSQL,cls);
- }
-
- public <T> List<T> selectAll(Class<T> cls){
+ return select(finalSQL, cls);
+ }
+
+ public <T> List<T> selectAll(Class<T> cls) {
String sql = selectFrontPart(cls);
- return select(sql,cls);
+ return select(sql, cls);
}
public List<Map<String, Object>> select(String sql) {
@@ -150,7 +152,7 @@
return executeUpdate(sql);
}
- public <T> int delete(Class<T> cls, Map<String,String> condition) {
+ public <T> int delete(Class<T> cls, Map<String, String> condition) {
String tableName = cls.getDeclaredAnnotation(TableName.class).value();
if (Cools.isEmpty(tableName)) {
return 0;
@@ -159,8 +161,8 @@
String finalSQL = addWhere(sql, condition);
return executeUpdate(finalSQL);
}
-
- public <T> int insert(Class<T> cls, Map<String,Object> condition){
+
+ public <T> int insert(Class<T> cls, Map<String, Object> condition) {
String tableName = cls.getDeclaredAnnotation(TableName.class).value();
if (Cools.isEmpty(tableName)) {
return 0;
@@ -168,9 +170,9 @@
String sql = "INSERT INTO " + tableName + " (";
int conditionSize = 1;
for (String s : condition.keySet()) {
- if (conditionSize == condition.keySet().size()){
- sql = sql +s+")";
- }else {
+ if (conditionSize == condition.keySet().size()) {
+ sql = sql + s + ")";
+ } else {
sql = sql + s + ",";
}
conditionSize = conditionSize + 1;
@@ -178,25 +180,23 @@
sql = sql + " VALUES(";
int valuesSize = 1;
for (String s : condition.keySet()) {
- if (valuesSize == condition.keySet().size()){
-
- sql = sql + condition.get(s)+")";
- }else {
+ if (valuesSize == condition.keySet().size()) {
+
+ sql = sql + condition.get(s) + ")";
+ } else {
sql = sql + condition.get(s) + ",";
}
valuesSize = valuesSize + 1;
}
-
+
return executeUpdate(sql);
}
-
-
+
/*****************************************************************************/
/********************************* 鏍稿績灞� *********************************/
/*****************************************************************************/
-
private List<Map<String, Object>> executeQuery(String sql) {
Connection conn = null;
@@ -254,8 +254,7 @@
Connection conn = null;
try {
conn = getConn();
- if(null != conn)
- {
+ if (null != conn) {
pstm = conn.prepareStatement(sql);
} else {
log.error("鏇存柊ERP涓棿琛ㄥけ璐�===>>鏁版嵁搴撹繛鎺onn涓虹┖");
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
index 2310230..94ed749 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java
@@ -1,8 +1,15 @@
package com.zy.ints.task.scheduler;
+import com.zy.asrs.service.MatService;
+import com.zy.ints.entity.ErpDetTb;
+import com.zy.ints.erp.ErpSqlServer;
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;
import org.springframework.stereotype.Component;
+
+import java.util.List;
/**
* erp浠诲姟鎺у埗鍣�
@@ -16,4 +23,38 @@
*/
@Value("${erp.enabled}")
private Boolean erpEnabled;
+ @Autowired
+ private ErpSqlServer erpSqlServer;
+ @Autowired
+ private MatService matService;
+ /**
+ * 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
+ */
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void InOrOutOrder() {
+ if (!erpEnabled) return;
+ String sqlSelecterpDetTb = "select bill_no as billNo,prd_no as prdNo,iokindid,add_id as addId,qty,prd_mark as prdMark,wh,billdate,status,temp1,temp2,temp3 from erp_det_tb where 1=1";
+ String sqlUpDateerpDetTbOne = "update erp_det_tb set status=1 where prd_no=";
+ String sqlUpDateerpDetTbTwo = "update erp_det_tb set status=2 where prd_no=";
+
+ try {
+ List<ErpDetTb> erpDetTbs = erpSqlServer.select(sqlSelecterpDetTb, ErpDetTb.class);
+ if (erpDetTbs.size() > 0){
+ for (ErpDetTb erpDetTb:erpDetTbs){
+ Integer status = erpDetTb.getStatus();
+ if (status == 0){
+
+ }else if (status == 1){
+
+ }else if (status == 2){
+
+ }else {
+
+ }
+ }
+ }
+ }catch (Exception e){
+
+ }
+ }
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
new file mode 100644
index 0000000..e2adc02
--- /dev/null
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java
@@ -0,0 +1,57 @@
+package com.zy.ints.task.scheduler;
+
+import com.zy.ints.entity.ErpLk;
+import com.zy.ints.erp.ErpSqlServer;
+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;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * erp浠诲姟鎺у埗鍣�
+ * Created by vincent on 2020/11/27
+ */
+@Slf4j
+@Component
+public class ErpLkScheduler {
+ /**
+ * ERP鎺ュ彛鏄惁鍚敤
+ */
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
+ @Autowired
+ private ErpSqlServer erpSqlServer;
+ /**
+ * 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
+ */
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void InOrOutOrder() {
+ if (!erpEnabled) return;
+ String sqlSelecterpLk = "select prd_no as prdNo,prd_mark as prdMark,qty,wh,status,temp1,temp2,temp3 from bas_erp_lk where 1=1";
+ String sqlUpDateerpLkOne = "update bas_erp_lk set status=1 where prd_no=";
+ String sqlUpDateerpLkTwo = "update bas_erp_lk set status=2 where prd_no=";
+
+ try {
+ List<ErpLk> erpLks = erpSqlServer.select(sqlSelecterpLk, ErpLk.class);
+ if (erpLks.size() > 0){
+ for (ErpLk erpLk:erpLks){
+ Integer status = erpLk.getStatus();
+ if (status == 0){
+
+ }else if (status == 1){
+
+ }else if (status == 2){
+
+ }else {
+
+ }
+ }
+ }
+ }catch (Exception e){
+
+ }
+ }
+}
diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
index 3ac1b0c..5fe2939 100644
--- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
+++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java
@@ -6,6 +6,7 @@
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.TagService;
import com.zy.ints.entity.Prdt;
+import com.zy.ints.entity.PrdtBak;
import com.zy.ints.erp.ErpSqlServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,7 @@
private ErpSqlServer erpSqlServer;
@Autowired
private MatService matService;
+
/**
* 鑾峰彇鍟嗗搧淇℃伅琛ㄨ祫鏂�
*/
@@ -45,77 +47,81 @@
String sqlSelectPrdt = "select prd_no as prdNo,name,ut,spc,type,status from erp_prdt where 1=1";
String sqlUpDatePrdtOne = "update erp_prdt set status=1 where prd_no=";
String sqlUpDatePrdtTwo = "update erp_prdt set status=2 where prd_no=";
- Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
+ try {
+ Tag tag = tagService.selectByName("鍏ㄩ儴", 1);
- List<Prdt> prdts = erpSqlServer.select(sqlSelectPrdt,Prdt.class);
- if (prdts.size() > 0){
- for (Prdt prdt : prdts) {
- Date date = new Date();
- if (prdt.getStatus()==0) {
- Integer type = prdt.getType();
- if (type==1){
- Mat mat = matService.selectByMatnr(prdt.getPrdNo());
- if (Cools.isEmpty(mat)){
- Mat matNew = new Mat();
- matNew.setTagId(tag.getId());
- matNew.setMatnr(prdt.getPrdNo());
- matNew.setMaktx(prdt.getName());
- matNew.setUnit(prdt.getUt());
- matNew.setSpecs(prdt.getSpc());
- matNew.setCreateBy(9999L);
- matNew.setCreateTime(date);
- matNew.setUpdateBy(9999L);
- matNew.setUpdateTime(date);
- if (matService.insert(matNew)){
- erpSqlServer.update(sqlUpDatePrdtOne+"'" + prdt.getPrdNo() + "'");
- }else {
- erpSqlServer.update(sqlUpDatePrdtTwo+"'" + prdt.getPrdNo() + "'");
+ List<Prdt> prdts = erpSqlServer.select(sqlSelectPrdt, Prdt.class);
+ if (prdts.size() > 0) {
+ for (Prdt prdt : prdts) {
+ Date date = new Date();
+ if (prdt.getStatus() == 0) {
+ Integer type = prdt.getType();
+ if (type == 1) {
+ Mat mat = matService.selectByMatnr(prdt.getPrdNo());
+ if (Cools.isEmpty(mat)) {
+ Mat matNew = new Mat();
+ matNew.setTagId(tag.getId());
+ matNew.setMatnr(prdt.getPrdNo());
+ matNew.setMaktx(prdt.getName());
+ matNew.setUnit(prdt.getUt());
+ matNew.setSpecs(prdt.getSpc());
+ matNew.setCreateBy(9999L);
+ matNew.setCreateTime(date);
+ matNew.setUpdateBy(9999L);
+ matNew.setUpdateTime(date);
+ if (matService.insert(matNew)) {
+ erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
+ } else {
+ erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
+ }
}
- }
- }else if (type==2){
- Mat mat = matService.selectByMatnr(prdt.getPrdNo());
- if (!Cools.isEmpty(mat)){
- mat.setMaktx(prdt.getName());
- mat.setUnit(prdt.getUt());
- mat.setSpecs(prdt.getSpc());
- if (matService.updateById(mat)){
- erpSqlServer.update(sqlUpDatePrdtOne+"'" + prdt.getPrdNo() + "'");
- }else {
- erpSqlServer.update(sqlUpDatePrdtTwo+"'" + prdt.getPrdNo() + "'");
+ } else if (type == 2) {
+ Mat mat = matService.selectByMatnr(prdt.getPrdNo());
+ if (!Cools.isEmpty(mat)) {
+ mat.setMaktx(prdt.getName());
+ mat.setUnit(prdt.getUt());
+ mat.setSpecs(prdt.getSpc());
+ if (matService.updateById(mat)) {
+ erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
+ } else {
+ erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
+ }
}
- }
- }else if (type==3){
- Mat mat = matService.selectByMatnr(prdt.getPrdNo());
- if (!Cools.isEmpty(mat)){
- if (matService.deleteById(mat.getId())){
- erpSqlServer.update(sqlUpDatePrdtOne+"'" + prdt.getPrdNo() + "'");
- }else {
- erpSqlServer.update(sqlUpDatePrdtTwo+"'" + prdt.getPrdNo() + "'");
+ } else if (type == 3) {
+ Mat mat = matService.selectByMatnr(prdt.getPrdNo());
+ if (!Cools.isEmpty(mat)) {
+ if (matService.deleteById(mat.getId())) {
+ erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'");
+ } else {
+ erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'");
+ }
}
+ } else {
+
}
- }else {
+ } else if (prdt.getStatus() == 1) {
+ HashMap<String, Object> condition = new HashMap<>();
+ condition.put("prd_no", "'" + prdt.getPrdNo() + "'");
+ condition.put("name", "'" + prdt.getName() + "'");
+ condition.put("ut", "'" + prdt.getUt() + "'");
+ condition.put("spc", "'" + prdt.getSpc() + "'");
+ condition.put("type", "'" + prdt.getType() + "'");
+ condition.put("status", "'" + prdt.getStatus() + "'");
+ erpSqlServer.insert(PrdtBak.class, condition);
+
+ HashMap<String, String> condition2 = new HashMap<>();
+ condition2.put("prd_no", "'" + prdt.getPrdNo() + "'");
+ erpSqlServer.delete(Prdt.class, condition2);
+ } else if (prdt.getStatus() == 2) {
+
+ } else {
}
- }else if (prdt.getStatus()==1){
-// HashMap<String, Object> condition = new HashMap<>();
-// condition.put("prd_no","'" + prdt.getPrdNo() + "'");
-// condition.put("name","'" + prdt.getName() + "'");
-// condition.put("ut","'" + prdt.getUt() + "'");
-// condition.put("spc","'" + prdt.getSpc() + "'");
-// condition.put("type","'" + prdt.getType() + "'");
-// condition.put("status","'" + prdt.getStatus() + "'");
-// erpSqlServer.insert(Prdt.class, condition);
-//
-// HashMap<String, String> condition2 = new HashMap<>();
-// condition2.put("prd_no","'" + prdt.getPrdNo() + "'");
-// erpSqlServer.delete(Prdt.class,condition2);
- }else if (prdt.getStatus()==2){
-
- }else {
}
-
}
+ } catch (Exception e) {
+
}
}
diff --git a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
new file mode 100644
index 0000000..4898944
--- /dev/null
+++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java
@@ -0,0 +1,57 @@
+package com.zy.ints.task.scheduler;
+
+import com.zy.ints.entity.LkDetTb;
+import com.zy.ints.erp.ErpSqlServer;
+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;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * erp浠诲姟鎺у埗鍣�
+ * Created by vincent on 2020/11/27
+ */
+@Slf4j
+@Component
+public class LkDetTbScheduler {
+ /**
+ * ERP鎺ュ彛鏄惁鍚敤
+ */
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
+ @Autowired
+ private ErpSqlServer erpSqlServer;
+ /**
+ * 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭�
+ */
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void InOrOutOrder() {
+ if (!erpEnabled) return;
+ String sqlSelectlkDetTb = "select bill_no as billNo,prd_no as prdNo,iokindid,add_id as addId,qty,prd_mark as prdMark,wh,billdate,status,temp1,temp2,temp3 from lk_det_tb where 1=1";
+ String sqlUpDatelkDetTbOne = "update lk_det_tb set status=1 where prd_no=";
+ String sqlUpDatelkDetTbTwo = "update lk_det_tb set status=2 where prd_no=";
+
+ try {
+ List<LkDetTb> lkDetTbs = erpSqlServer.select(sqlSelectlkDetTb, LkDetTb.class);
+ if (lkDetTbs.size() > 0){
+ for (LkDetTb lkDetTb:lkDetTbs){
+ Integer status = lkDetTb.getStatus();
+ if (status == 0){
+
+ }else if (status == 1){
+
+ }else if (status == 2){
+
+ }else {
+
+ }
+ }
+ }
+ }catch (Exception e){
+
+ }
+ }
+}
--
Gitblit v1.9.1