From 7125be069f3f926afe3e15366e9211646de1c637 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 19 七月 2024 15:35:12 +0800
Subject: [PATCH] 中间表代码提交,初步测试完成
---
src/main/java/com/zy/third/erp/entity/ItemTB.java | 174 ---
src/main/java/com/zy/third/erp/entity/InDetTB.java | 217 +---
src/main/java/com/zy/third/lk/entity/OutHedTBBak.java | 42
src/main/java/com/zy/third/lk/entity/ErpLKStorage.java | 23
src/main/java/com/zy/third/erp/task/ERPItemService.java | 10
src/main/java/com/zy/third/erp/entity/OutDetTB.java | 132 +++
src/main/java/com/zy/third/erp/entity/OutHedTB.java | 100 ++
src/main/java/com/zy/common/service/erp/ErpSqlServer.java | 107 +-
src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java | 66 +
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2
src/main/java/com/zy/third/erp/entity/InCancelTB.java | 30
src/main/java/com/zy/third/lk/entity/OutDetTBBak.java | 31
src/main/java/com/zy/asrs/entity/Mat.java | 43
src/main/java/com/zy/third/erp/entity/OutCancelTB.java | 47 +
src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java | 63 +
src/main/java/com/zy/asrs/entity/OrderDetl.java | 183 ++-
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 4
src/main/java/com/zy/third/lk/entity/InDetTB.java | 29
src/main/java/com/zy/third/erp/task/ERPItemScheduler.java | 10
src/main/java/com/zy/asrs/entity/Order.java | 4
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 98 +-
src/main/resources/mapper/OrderDetlMapper.xml | 6
/dev/null | 147 ---
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 35
src/main/java/com/zy/third/lk/entity/InDetTBBak.java | 142 +++
src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java | 21
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 5
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 12
src/main/java/com/zy/third/lk/entity/OutDetTB.java | 30
src/main/java/com/zy/third/erp/entity/InHedTB.java | 156 ---
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 240 +++++
src/main/java/com/zy/third/lk/entity/InHedTBBak.java | 118 ++
src/main/java/update20240719.sql | 168 ++++
33 files changed, 1,611 insertions(+), 884 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 989e678..5e779e6 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -328,32 +328,33 @@
/**
* 澶栭儴涓婚敭
*/
- @TableField("auto_id")
- private Integer autoId;
- /**
- * 璁㈠崟鍙�
- */
- @TableField("out_order_no")
- private String outOrderNo;
+// @TableField("auto_id")
+// private Integer autoId;
+// /**
+// * 璁㈠崟鍙�
+// */
+// @TableField("out_order_no")
+// private String outOrderNo;
+//
+// /**
+// * 鐐夊彿\瀹㈡埛鍥惧彿
+// */
+// @TableField("lu_hao")
+// private String luHao;
+//
+// /**
+// * 宸ュ崟鍙�
+// */
+// @TableField("pg_no")
+// private String sPgNO;
- /**
- * 鐐夊彿\瀹㈡埛鍥惧彿
- */
- @TableField("lu_hao")
- private String luHao;
-
- /**
- * 宸ュ崟鍙�
- */
- @TableField("pg_no")
- private String sPgNO;
-
-
+ @TableField("temp1")
private String temp1;
-
+ @TableField("temp2")
private String temp2;
+ @TableField("temp3")
private String temp3;
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index 5aebc90..bbfd19e 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -93,7 +93,7 @@
* 瀹㈡埛缂栧彿
*/
@ApiModelProperty(value= "瀹㈡埛缂栧彿")
- private Long cstmr;
+ private String cstmr;
/**
* 瀹㈡埛
@@ -270,7 +270,7 @@
public Order() {}
- public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,String cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.orderNo = orderNo;
this.orderTime = orderTime;
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 82f80de..029c03b 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -27,21 +27,21 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
+ @ApiModelProperty(value = "ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁㈠崟鍐呯爜
*/
- @ApiModelProperty(value= "璁㈠崟鍐呯爜")
+ @ApiModelProperty(value = "璁㈠崟鍐呯爜")
@TableField("order_id")
private Long orderId;
/**
* 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @ApiModelProperty(value = "鍗曟嵁缂栧彿")
@TableField("order_no")
private String orderNo;
@@ -49,253 +49,254 @@
/**
* 鏁伴噺
*/
- @ApiModelProperty(value= "鏁伴噺")
+ @ApiModelProperty(value = "鏁伴噺")
private Double anfme;
/**
* 浣滀笟鏁伴噺
- *
- * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
- * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
+ * <p>
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
- @ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @ApiModelProperty(value = "浣滀笟鏁伴噺")
@TableField("work_qty")
private Double workQty;
/**
* 瀹屾垚鏁伴噺
- *
- * 鍏ュ簱 : qty 馃憜
- * 鍑哄簱 : qty 馃憜
+ * <p>
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
*/
- @ApiModelProperty(value= "瀹屾垚鏁伴噺")
+ @ApiModelProperty(value = "瀹屾垚鏁伴噺")
private Double qty;
/**
* 鍟嗗搧缂栫爜
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value = "鍟嗗搧缂栫爜")
private String matnr;
/**
* 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value = "鍟嗗搧鍚嶇О")
private String maktx;
/**
* 鎵瑰彿
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value = "鎵瑰彿")
private String batch;
/**
* 瑙勬牸
*/
- @ApiModelProperty(value= "瑙勬牸")
+ @ApiModelProperty(value = "瑙勬牸")
private String specs;
/**
* 鍨嬪彿
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value = "鍨嬪彿")
private String model;
/**
* 棰滆壊
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value = "棰滆壊")
private String color;
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value = "鍝佺墝")
private String brand;
/**
* 鍗曚綅
*/
- @ApiModelProperty(value= "鍗曚綅")
+ @ApiModelProperty(value = "鍗曚綅")
private String unit;
/**
* 鍗曚环
*/
- @ApiModelProperty(value= "鍗曚环")
+ @ApiModelProperty(value = "鍗曚环")
private Double price;
/**
* sku
*/
- @ApiModelProperty(value= "sku")
+ @ApiModelProperty(value = "sku")
private String sku;
/**
* 鍗曚綅閲�
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value = "鍗曚綅閲�")
private Double units;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
/**
* 浜у湴
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value = "浜у湴")
private String origin;
/**
* 鍘傚
*/
- @ApiModelProperty(value= "鍘傚")
+ @ApiModelProperty(value = "鍘傚")
private String manu;
/**
* 鐢熶骇鏃ユ湡
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
@TableField("manu_date")
private String manuDate;
/**
* 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝侀」鏁�")
+ @ApiModelProperty(value = "鍝侀」鏁�")
@TableField("item_num")
private String itemNum;
/**
* 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ @ApiModelProperty(value = "瀹夊叏搴撳瓨閲�")
@TableField("safe_qty")
private Double safeQty;
/**
* 閲嶉噺
*/
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value = "閲嶉噺")
private Double weight;
/**
* 闀垮害
*/
- @ApiModelProperty(value= "闀垮害")
+ @ApiModelProperty(value = "闀垮害")
private Double length;
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value = "浣撶Н")
private Double volume;
/**
* 涓夋柟缂栫爜
*/
- @ApiModelProperty(value= "涓夋柟缂栫爜")
+ @ApiModelProperty(value = "涓夋柟缂栫爜")
@TableField("three_code")
private String threeCode;
/**
* 渚涘簲鍟�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value = "渚涘簲鍟�")
private String supp;
/**
* 渚涘簲鍟嗙紪鐮�
*/
- @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
+ @ApiModelProperty(value = "渚涘簲鍟嗙紪鐮�")
@TableField("supp_code")
private String suppCode;
/**
* 鏄惁鎵规 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鏄惁鎵规 1: 鏄� 0: 鍚� ")
@TableField("be_batch")
private Integer beBatch;
/**
* 淇濊川鏈�
*/
- @ApiModelProperty(value= "淇濊川鏈�")
+ @ApiModelProperty(value = "淇濊川鏈�")
@TableField("dead_time")
private String deadTime;
/**
* 棰勮澶╂暟
*/
- @ApiModelProperty(value= "棰勮澶╂暟")
+ @ApiModelProperty(value = "棰勮澶╂暟")
@TableField("dead_warn")
private Integer deadWarn;
/**
* 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
- @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ @ApiModelProperty(value = "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
/**
* 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
private Integer inspect;
/**
* 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
*/
- @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ @ApiModelProperty(value = "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
- @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ @ApiModelProperty(value = "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
/**
* 娣诲姞浜哄憳
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @ApiModelProperty(value = "娣诲姞浜哄憳")
@TableField("create_by")
private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
-
+ @TableField("i_no")
+ private Integer iNO;
/**
* 澶栭儴涓婚敭
@@ -311,22 +312,34 @@
@TableField("lu_hao")
private String luHao;
+ @TableField("ware_id")
+ private String wareId;
+
+ @TableField("ware_name")
+ private String wareName;
+
+ @TableField("packing")
+ private String packing;
/**
* 宸ュ崟鍙�
*/
@TableField("pg_no")
private String sPgNO;
-
+ @TableField("temp1")
private String temp1;
-
+ @TableField("temp2")
private String temp2;
+ @TableField("temp3")
private String temp3;
+ @TableField("pro_type")
+ private String proType;
- public OrderDetl() {}
+ public OrderDetl() {
+ }
public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderId = orderId;
@@ -370,18 +383,20 @@
this.memo = memo;
}
- public String getOrderId$(){
+ public String getOrderId$() {
OrderService service = SpringUtils.getBean(OrderService.class);
Order order = service.selectById(this.orderId);
- if (!Cools.isEmpty(order)){
+ if (!Cools.isEmpty(order)) {
return String.valueOf(order.getId());
}
return null;
}
- public String getBeBatch$(){
- if (null == this.beBatch){ return null; }
- switch (this.beBatch){
+ public String getBeBatch$() {
+ if (null == this.beBatch) {
+ return null;
+ }
+ switch (this.beBatch) {
case 1:
return "鏄�";
case 0:
@@ -391,9 +406,11 @@
}
}
- public String getSource$(){
- if (null == this.source){ return null; }
- switch (this.source){
+ public String getSource$() {
+ if (null == this.source) {
+ return null;
+ }
+ switch (this.source) {
case 1:
return "鍒堕��";
case 2:
@@ -405,9 +422,11 @@
}
}
- public String getInspect$(){
- if (null == this.inspect){ return null; }
- switch (this.inspect){
+ public String getInspect$() {
+ if (null == this.inspect) {
+ return null;
+ }
+ switch (this.inspect) {
case 1:
return "鏄�";
case 0:
@@ -417,9 +436,11 @@
}
}
- public String getDanger$(){
- if (null == this.danger){ return null; }
- switch (this.danger){
+ public String getDanger$() {
+ if (null == this.danger) {
+ return null;
+ }
+ switch (this.danger) {
case 1:
return "鏄�";
case 0:
@@ -429,9 +450,11 @@
}
}
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public String getStatus$() {
+ if (null == this.status) {
+ return null;
+ }
+ switch (this.status) {
case 1:
return "姝ｅ父";
case 0:
@@ -441,33 +464,33 @@
}
}
- public String getCreateBy$(){
+ public String getCreateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
+ public String getCreateTime$() {
+ if (Cools.isEmpty(this.createTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
+ public String getUpdateBy$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getUpdateTime$() {
+ if (Cools.isEmpty(this.updateTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
@@ -483,8 +506,8 @@
return null;
}
- public String getQty$(){
- if (getAnfme().equals(getQty())){
+ public String getQty$() {
+ if (getAnfme().equals(getQty())) {
return "宸插畬鎴�";
}
return "鏈畬鎴�";
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 51c99ad..cef6709 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -34,4 +34,8 @@
int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+
+
+ List<OrderDetl> listByOrderNo(@Param("orderNo") String orderNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index ecf08d2..f180200 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -37,4 +37,6 @@
* @return
*/
boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+
+ List<OrderDetl> selectItem(String orderNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 327edbb..3f08146 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -27,6 +27,11 @@
}
@Override
+ public List<OrderDetl> selectItem(String orderNo) {
+ return this.baseMapper.listByOrderNo(orderNo);
+ }
+
+ @Override
public OrderDetl selectItem(Long orderId, String matnr, String batch) {
return this.baseMapper.selectItem(orderId, matnr, batch);
}
diff --git a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
index a94c994..3469eec 100644
--- a/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
+++ b/src/main/java/com/zy/common/service/erp/ErpSqlServer.java
@@ -1,11 +1,12 @@
package com.zy.common.service.erp;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
import com.zy.third.erp.entity.InDetTB;
+import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,14 +43,14 @@
// sql = "update InStockBill set Fflag_finish = 1 where FBillNo = ''{0}''";
// sql = MessageFormat.format(sql, "123456");
// erpSqlServer.update(sql);
-
+
HashMap<String, Object> stringStringHashMap = new HashMap<>();
- stringStringHashMap.put("BillNo","'1231312'");
- stringStringHashMap.put("test","'1231312'");
- stringStringHashMap.put("BilhahahlNo","'1231312'");
- stringStringHashMap.put("B21312illNo","'1231312'");
- stringStringHashMap.put("testnum",100);
- erpSqlServer.insert(InDetTB.class,stringStringHashMap);
+ stringStringHashMap.put("BillNo", "'1231312'");
+ stringStringHashMap.put("test", "'1231312'");
+ stringStringHashMap.put("BilhahahlNo", "'1231312'");
+ stringStringHashMap.put("B21312illNo", "'1231312'");
+ stringStringHashMap.put("testnum", 100);
+ erpSqlServer.insert(InDetTB.class, stringStringHashMap);
}
// 鏁版嵁搴撹繛鎺�
@@ -74,22 +75,42 @@
List<T> list = new ArrayList<>();
if (null != result) {
for (Map<String, Object> entity : result) {
- list.add(Cools.conver(entity, cls));
+ //鐢ㄦ渶绗ㄧ殑鏂规硶杞崲锛屼篃鍙互鐢ㄤ笅闈㈢殑process鏂规硶锛堣繕娌℃湁鍐欏叏锛�
+ list.add(JSONObject.parseObject(JSONObject.toJSONString(entity), cls));
+ //list.add(Cools.conver(entity, cls));
}
}
return list;
}
-
-
+
+ @SneakyThrows
+ public <T> void process(Map<String, Object> entity, Class<T> cls) {
+ for (Map.Entry<String, Object> entry : entity.entrySet()) {
+ String fieldName = entry.getKey();
+ Object value = entry.getValue();
+
+ Field field = cls.getDeclaredField(fieldName);
+ field.setAccessible(true);
+
+ if (value instanceof Integer && field.getType() == int.class || field.getType() == Integer.class) {
+ field.setInt(cls, (Integer) value);
+ } else if (value instanceof String && field.getType() == String.class) {
+ field.set(cls, value);
+ }
+ // 鍏朵粬绫诲瀷鍙互绫讳技澶勭悊
+ }
+ }
+
/**
* 鎵弿鎵�鏈夊疄鍔涚被灞炴�ч噷鐨凾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;
@@ -98,7 +119,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;
@@ -110,16 +131,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) + ", ";
}
@@ -128,40 +149,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) {
@@ -175,7 +197,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;
@@ -184,8 +206,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;
@@ -193,9 +215,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;
@@ -203,25 +225,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;
@@ -285,8 +305,7 @@
Connection conn = null;
try {
conn = getConn();
- if(null != conn)
- {
+ if (null != conn) {
pstm = conn.prepareStatement(sql);
pstm.setQueryTimeout(QUERY_TIMEOUT_SECONDS);
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 add2606..6ae39cf 100644
--- a/src/main/java/com/zy/third/erp/entity/InCancelTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InCancelTB.java
@@ -1,20 +1,18 @@
package com.zy.third.erp.entity;
import com.baomidou.mybatisplus.annotations.TableField;
-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.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.core.common.Cools;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@NoArgsConstructor
@@ -23,28 +21,28 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "AutoId",type = IdType.AUTO)
+ @TableId(value = "AutoId", type = IdType.AUTO)
@TableField(value = "AutoId")
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "BillNo", type = IdType.INPUT)
@TableField("BillNo")
private String BillNo;
- @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= "")
+ @ApiModelProperty(value = "")
@TableField("LKName")
private String LKName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("FactArea")
private String FactArea;
@@ -66,8 +64,8 @@
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);
@@ -76,8 +74,6 @@
public void setMakeDate(Date MakeDate) {
this.MakeDate = MakeDate;
}
-
-
}
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 ef5df29..16ef6fa 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
@@ -39,47 +27,46 @@
@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;
/**
* erp琛屽敮涓�鐮�
*/
- @ApiModelProperty(value= "erp琛屽敮涓�鐮�")
+ @ApiModelProperty(value = "erp琛屽敮涓�鐮�")
@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;
@@ -89,165 +76,61 @@
@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;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("LKName")
private String LKName;
+ /**
+ *
+ */
+ @TableField("FactArea")
+ private String FactArea;
+ /**
+ * 渚涘簲鍟哱瀹㈡埛ID
+ */
+ @TableField("Packing")
+ private String Packing;
+ /**
+ * 棰滆壊
+ */
+ @TableField("sColor")
+ private String sColor;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("LuHao")
+ private String LuHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("sPgNO")
+ 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;
}
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 95b65d4..88f75dd 100644
--- a/src/main/java/com/zy/third/erp/entity/InHedTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InHedTB.java
@@ -1,26 +1,14 @@
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 java.text.SimpleDateFormat;
-import java.util.Date;
-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.util.Date;
@Data
@TableName("erp_InHedTB")
@@ -32,22 +20,21 @@
@TableId(value = "AutoId", type = IdType.AUTO)
private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "BillNo", type = IdType.INPUT)
@TableField("BillNo")
private String BillNo;
/**
* StockIn:閲囪喘鍏ュ簱
-ProductIn:鎴愬搧鍏ュ簱鍗�
-ItemMoveIn:璋冩嫧鍏ュ簱
-ItemSwitchIn:褰㈡�佽浆鎹㈠叆搴�
-CheckMoreIn:鐩樼泩鍏ュ簱鍗�
-
+ * ProductIn:鎴愬搧鍏ュ簱鍗�
+ * ItemMoveIn:璋冩嫧鍏ュ簱
+ * ItemSwitchIn:褰㈡�佽浆鎹㈠叆搴�
+ * CheckMoreIn:鐩樼泩鍏ュ簱鍗�
*/
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField("BillDate")
- private String billDate;
+ private Date BillDate;
@TableField("IoKindID")
private String IoKindID;
@@ -58,18 +45,18 @@
/**
* 渚涘簲鍟嗐�侀儴闂↖D
*/
- @ApiModelProperty(value= "渚涘簲鍟嗐�侀儴闂↖D")
+ @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂↖D")
@TableField("ObjectId")
- private String OjectId;
+ private String ObjectId;
/**
* 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
*/
@TableField("ObjectName")
- @ApiModelProperty(value= "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
- private String OjbectName;
+ @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
+ private String ObjectName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Remark")
private String remark;
@@ -79,128 +66,33 @@
@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= "")
+ @ApiModelProperty(value = "")
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@TableField("MakeDate")
- private String makedate;
+ private Date MakeDate;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("LKName")
private String LKName;
-
-
-// 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 String getMakedate() {
- return makedate;
- }
-
- public void setMakedate(String makedate) {
- this.makedate = makedate;
- }
-// public Date getMakedate() {
-// return 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;
- }
+ /**
+ *
+ */
+ @TableField("FactArea")
+ private String FactArea;
}
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 2f95211..fab4790 100644
--- a/src/main/java/com/zy/third/erp/entity/ItemTB.java
+++ b/src/main/java/com/zy/third/erp/entity/ItemTB.java
@@ -1,19 +1,18 @@
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 java.text.SimpleDateFormat;
-import java.util.Date;
-
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
@NoArgsConstructor
@@ -25,208 +24,77 @@
@TableId(value = "AutoId", type = IdType.AUTO)
private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "ItemId", type = IdType.INPUT)
@TableField("ItemId")
private String ItemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemCode")
private String ItemCode;
@TableField("ItemName")
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String ItemName;
@TableField("ItemSpc")
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String ItemSpc;
@TableField("ItemPic")
private String itemPic;
@TableField("ItemUnit")
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String ItemUnit;
/**
* 姣涘澂銆佸崐鎴愬搧銆佹垚鍝�
*/
@TableField("ItemKind")
- @ApiModelProperty(value= "姣涘澂銆佸崐鎴愬搧銆佹垚鍝�")
+ @ApiModelProperty(value = "姣涘澂銆佸崐鎴愬搧銆佹垚鍝�")
private String ItemKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Remark")
private String Remark;
/**
* 00锛氭柊澧� 22锛氬垹闄�
*/
- @ApiModelProperty(value= "00锛氭柊澧� 22锛氬垹闄�")
+ @ApiModelProperty(value = "00锛氭柊澧� 22锛氬垹闄�")
@TableField("Flag")
private String Flag;
- @ApiModelProperty(value= "")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss.fff")
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss.fff")
@TableField("MakeDate")
private Date MakeDate;
- @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= "")
+ @ApiModelProperty(value = "")
@TableField("LKName")
private String LKName;
- /**
- * 璁㈠崟鍙�
- */
- @TableField("order_no")
- private String orderNo;
- /**
- * 鐐夊彿\瀹㈡埛鍥惧彿
- */
- @TableField("lu_hao")
- private String luHao;
- /**
- * 宸ュ崟鍙�
- */
- @TableField("pg_no")
- private String sPgNO;
-
-// ItemTB itemTB = new ItemTB(
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, // [闈炵┖]
-// null, //
-// null, // [闈炵┖]
-// null, // 姣涘澂銆佸崐鎴愬搧銆佹垚鍝�
-// null, //
-// null, // 00锛氭柊澧� 22锛氬垹闄�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null //
-// );
-
- 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 getItemName() {
- return ItemName;
- }
-
- public void setItemName(String ItemName) {
- this.ItemName = ItemName;
- }
-
- public String getItemSpc() {
- return ItemSpc;
- }
-
- public void setItemSpc(String ItemSpc) {
- this.ItemSpc = ItemSpc;
- }
-
- public String getItemUnit() {
- return ItemUnit;
- }
-
- public void setItemUnit(String ItemUnit) {
- this.ItemUnit = ItemUnit;
- }
-
- public String getItemKind() {
- return ItemKind;
- }
-
- public void setItemKind(String ItemKind) {
- this.ItemKind = ItemKind;
- }
-
- public String getRemark() {
- return Remark;
- }
-
- public void setRemark(String remark) {
- this.Remark = remark;
- }
-
- public String getFlag() {
- return Flag;
- }
-
- public void setFlag(String flag) {
- this.Flag = flag;
- }
-
- 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 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/erp/entity/OutCancelTB.java b/src/main/java/com/zy/third/erp/entity/OutCancelTB.java
new file mode 100644
index 0000000..2f05237
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/entity/OutCancelTB.java
@@ -0,0 +1,47 @@
+package com.zy.third.erp.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 com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("erp_OutCancelTB")
+public class OutCancelTB implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
+
+ @ApiModelProperty(value = "")
+ @TableField("BillNo")
+ private String BillNo;
+
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("MakeDate")
+ private Date MakeDate;
+
+ @ApiModelProperty(value = "")
+ @TableField("LKName")
+ private String LKName;
+
+
+ public String getMakedate$() {
+ if (Cools.isEmpty(this.MakeDate)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.MakeDate);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/third/erp/entity/OutDetTB.java b/src/main/java/com/zy/third/erp/entity/OutDetTB.java
new file mode 100644
index 0000000..f6aebfb
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/entity/OutDetTB.java
@@ -0,0 +1,132 @@
+package com.zy.third.erp.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 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 java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("erp_OutDetTB")
+public class OutDetTB implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
+
+ @ApiModelProperty(value = "")
+ @TableField("BillNo")
+ private String BillNo;
+
+ @ApiModelProperty(value = "")
+ @TableField("iNo")
+ private Integer iNO;
+
+ @ApiModelProperty(value = "")
+ @TableField("DetId")
+ private Integer detId;
+
+ @ApiModelProperty(value = "")
+ @TableField("ItemId")
+ private String ItemId;
+
+ @ApiModelProperty(value = "")
+ @TableField("ItemCode")
+ private String ItemCode;
+
+ @ApiModelProperty(value = "")
+ @TableField("ItemBatch")
+ private String ItemBatch;
+
+ @ApiModelProperty(value = "")
+ @TableField("proType")
+ private String proType;
+
+ @ApiModelProperty(value = "")
+ @TableField("OrderNo")
+ private String OrderNo;
+
+ @ApiModelProperty(value = "")
+ @TableField("MainNum")
+ private Double MainNum;
+
+ @TableField("remark")
+ private String remark;
+
+ @TableField("WareId")
+ private String wareId;
+
+ @TableField("WareName")
+ private String wareName;
+
+ @ApiModelProperty(value = "")
+ private String temp1;
+
+ @ApiModelProperty(value = "")
+ private String temp2;
+
+ @ApiModelProperty(value = "")
+ private String temp3;
+
+ @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")
+// @TableField("DelDate")
+// private Date delDate;
+
+ @ApiModelProperty(value = "")
+ @TableField("LKName")
+ private String LKName;
+
+
+ @TableField("FactArea")
+ private String FactArea;
+
+ /**
+ * 渚涘簲鍟哱瀹㈡埛ID
+ */
+ @TableField("Packing")
+ private String Packing;
+ /**
+ * 棰滆壊
+ */
+ @TableField("sColor")
+ private String sColor;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("LuHao")
+ private String LuHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("sPgNO")
+ private String sPgNO;
+
+ public String getMakedate$() {
+ if (Cools.isEmpty(this.makedate)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/third/erp/entity/OutHedTB.java b/src/main/java/com/zy/third/erp/entity/OutHedTB.java
new file mode 100644
index 0000000..bf935e3
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/entity/OutHedTB.java
@@ -0,0 +1,100 @@
+package com.zy.third.erp.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.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("erp_OutHedTB")
+public class OutHedTB implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
+
+ @ApiModelProperty(value = "")
+ @TableId(value = "BillNo", type = IdType.INPUT)
+ @TableField("BillNo")
+ private String BillNo;
+
+
+ @TableField("BillDate")
+// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date BillDate;
+
+ /**
+ * SendMatOut:鍙戞枡鍑哄簱
+ * OtherOut:鍏跺畠鍑哄簱鍗�
+ * ItemMoveOut:璋冩嫧鍑哄簱
+ * ItemSwitchOut:褰㈡�佽浆鎹㈠嚭搴�
+ * CheckLossOut:鐩樼泩鍑哄簱鍗�
+ */
+ @ApiModelProperty(value = "SendMatOut:鍙戞枡鍑哄簱 ")
+ @TableField("IoKindID")
+ private String IoKindID;
+
+ @TableField("IoKindName")
+ private String ioKindName;
+
+ /**
+ * 閮ㄩ棬ID
+ */
+ @ApiModelProperty(value = "閮ㄩ棬ID")
+ @TableField("ObjectId")
+ private String ObjectId;
+
+ /**
+ * 閮ㄩ棬鍚嶇О
+ */
+ @ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
+ @TableField("ObjectName")
+ private String ObjectName;
+
+ @ApiModelProperty(value = "")
+ @TableField("Remark")
+ private String remark;
+
+ @TableField("WareId")
+ private String wareId;
+
+ @TableField("WareName")
+ private String wareName;
+
+ @ApiModelProperty(value = "")
+ @TableField("Temp1")
+ private String Temp1;
+
+ @ApiModelProperty(value = "")
+ @TableField("Temp2")
+ private String Temp2;
+
+ @ApiModelProperty(value = "")
+ @TableField("Temp3")
+ private String Temp3;
+
+
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("MakeDate")
+ private Date MakeDate;
+
+ @ApiModelProperty(value = "")
+ @TableField("LKName")
+ private String LKName;
+
+ @TableField("FactArea")
+ private String FactArea;
+
+}
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 3e8aacd..fee4625 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -7,6 +7,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
import java.util.List;
@@ -19,11 +20,13 @@
private Boolean erpEnabled;
@Autowired
- private ERPInCancelSchedulerMS inMS;
+ private ERPInOrOutCancelService inMS;
@Autowired
private ErpSqlServer erpSqlServer;
+
+ @Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void InCancelScheduler() {
log.info("InCancelScheduler寮�濮嬩簡");
@@ -32,15 +35,25 @@
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);
+ com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
if (lkCancel != null) {
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + in.getBillNo() + "'");
- erpSqlServer.delete(InCancelTB.class, condition);
+ int delete = erpSqlServer.delete(InCancelTB.class, condition);
+ if (delete > 0) {
+ log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゆ垚鍔�,{}", lkCancel.getBillNo());
+ } else {
+ log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゅけ璐�,{}", lkCancel.getBillNo());
+ }
HashMap<String, Object> content = new HashMap<>();
content.put("BillNo", "'" + lkCancel.getBillNo() + "'");
content.put("opFlag", lkCancel.getOpFlag());
- erpSqlServer.insert(com.zy.third.lk.entity.InCancelTB.class, content);
+ int insert = erpSqlServer.insert(com.zy.third.lk.entity.InCancelTB.class, content);
+ if (insert > 0) {
+ log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ユ垚鍔�,{}", lkCancel.getBillNo());
+ } else {
+ log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�,{}", lkCancel.getBillNo());
+ }
} else {
log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�");
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelSchedulerMS.java b/src/main/java/com/zy/third/erp/task/ERPInCancelSchedulerMS.java
deleted file mode 100644
index fb0c017..0000000
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelSchedulerMS.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.zy.third.erp.task;
-
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
-import com.zy.third.erp.entity.InCancelTB;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@Component
-public class ERPInCancelSchedulerMS {
-
- @Autowired
- private OrderService orderService;
-
- @Autowired
- private OrderDetlService orderDetlService;
-
-
- public com.zy.third.lk.entity.InCancelTB tryCancel(InCancelTB in) {
- com.zy.third.lk.entity.InCancelTB lkCancel = new com.zy.third.lk.entity.InCancelTB();
-
- List<Order> targets = orderService.selectList(new EntityWrapper<Order>()
- .eq("bill_no", in.getBillNo()));
-
- if (targets.size() <= 0) {
- lkCancel.setBillNo(in.getBillNo());
- //erp鏂硅姹�,璁㈠崟鎵句笉鍒�,杩斿洖1
- lkCancel.setOpFlag(1);
- lkCancel.setMakeDate(new Date());
- return lkCancel;
- } else {
- for (Order target : targets) {
- if (target.getSettle() > 1L) {
- lkCancel.setBillNo(in.getBillNo());
- lkCancel.setOpFlag(2);
- lkCancel.setMakeDate(new Date());
- return lkCancel;
- }
- }
- lkCancel.setBillNo(in.getBillNo());
- lkCancel.setOpFlag(1);
- lkCancel.setMakeDate(new Date());
- return lkCancel;
- }
-
- }
-}
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 cd51026..34dc211 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -26,19 +26,21 @@
@Autowired
- private ERPInOrOutTBSchedulerMS inMS;
+ private ERPInOrOutService inMS;
@Autowired
private ErpSqlServer erpSqlServer;
+
+ @Transactional(rollbackFor = Throwable.class)
@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) {
+ if (!inHeds.isEmpty()) {
for (InHedTB inHed : inHeds) {
System.out.println(inHed);
HashMap<String, String> condition = new HashMap<>();
@@ -47,7 +49,7 @@
HashMap<String, Object> hedAndDet = new HashMap<>();
hedAndDet.put("hed", inHed);
hedAndDet.put("det", inDetTBS);
- boolean result = inMS.createOrder(inHed, inDetTBS);
+ boolean result = inMS.createInOrder(inHed, inDetTBS);
if (result) {
move(hedAndDet);
} else {
@@ -58,7 +60,8 @@
}
}
- @Transactional
+
+ @Transactional(rollbackFor = Throwable.class)
public void move(HashMap<String, Object> hedAndDet) {
InHedTB hed = (InHedTB) hedAndDet.get("hed");
ArrayList<InDetTB> dets = (ArrayList<InDetTB>) hedAndDet.get("det");
@@ -71,7 +74,6 @@
condition2.put("BillNo", "'" + det.getBillNo() + "'");
condition2.put("iNo", String.valueOf(det.getINO()));
erpSqlServer.delete(InDetTB.class, condition2);
-
}
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java
new file mode 100644
index 0000000..a2b3f8f
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java
@@ -0,0 +1,66 @@
+package com.zy.third.erp.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+@Slf4j
+@Component
+public class ERPInOrOutCancelService {
+
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+
+ public com.zy.third.lk.entity.InCancelTB tryCancel(String orderNo) {
+ com.zy.third.lk.entity.InCancelTB lkCancel = new com.zy.third.lk.entity.InCancelTB();
+
+ List<Order> targets = orderService.selectList(new EntityWrapper<Order>()
+ .eq("order_no",orderNo));
+ log.info("瑕佸彇娑堢殑璁㈠崟锛歿}", targets);
+ if (targets.isEmpty()) {
+ lkCancel.setBillNo(orderNo);
+ //erp鏂硅姹�,璁㈠崟鎵句笉鍒�,杩斿洖1
+ lkCancel.setOpFlag(1);
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ } else {
+ //榛樿璁㈠崟id涓嶈兘閲嶅
+ Order order = targets.get(0);
+ List<OrderDetl> detlList = orderDetlService.selectItem(order.getOrderNo());
+ log.info("瑕佸彇娑堢殑璁㈠崟璇︽儏锛歿}", detlList);
+ Optional<OrderDetl> any = detlList.stream().filter(s -> s.getQty().compareTo(0D) > 0).findAny();
+ if (order.getSettle() > 1L || any.isPresent()) {
+ lkCancel.setBillNo(orderNo);
+ lkCancel.setOpFlag(2);
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ }
+ orderService.addToLogTable(order);
+ orderService.delete(new EntityWrapper<Order>()
+ .eq("order_no", order.getOrderNo()));
+ detlList.stream().forEach(d -> orderDetlService.addToLogTable(d));
+ orderDetlService.delete(new EntityWrapper<OrderDetl>()
+ .eq("order_no", order.getOrderNo()));
+ lkCancel.setBillNo(orderNo);
+ lkCancel.setOpFlag(1);
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ }
+
+ }
+
+
+}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
new file mode 100644
index 0000000..6904b70
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -0,0 +1,240 @@
+package com.zy.third.erp.task;
+
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.DocType;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.third.erp.entity.InDetTB;
+import com.zy.third.erp.entity.InHedTB;
+import com.zy.third.erp.entity.OutDetTB;
+import com.zy.third.erp.entity.OutHedTB;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.List;
+
+@Slf4j
+@Component
+public class ERPInOrOutService {
+
+
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+
+ @Autowired
+ private DocTypeService docTypeService;
+
+
+ @Autowired
+ private MatService matService;
+
+
+ /**
+ * @return
+ */
+ @Transactional(rollbackFor = Throwable.class)
+ public boolean createInOrder(InHedTB inHedTB, List<InDetTB> inDetTBs) {
+ Order order = orderService.selectByNo(inHedTB.getBillNo());
+ // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
+ if (!Cools.isEmpty(order)) {
+ if (order.getSettle() > 1L) {
+ throw new CoolException(inHedTB.getBillNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ }
+ orderService.remove(order.getId());
+ }
+ DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ inHedTB.getBillNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(inHedTB.getBillDate()), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ inHedTB.getObjectId(), // 瀹㈡埛缂栧彿
+ inHedTB.getObjectName(), // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ inHedTB.getMakeDate(), // 淇敼鏃堕棿
+ inHedTB.getRemark() // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ for (InDetTB outDetTB : inDetTBs) {
+ Mat mat = matService.selectByMatnr(outDetTB.getItemCode());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(outDetTB.getItemCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setOrderNo(outDetTB.getBillNo());
+ orderDetl.setOutOrderNo(outDetTB.getOrderNo());
+ orderDetl.setAutoId(outDetTB.getAutoId());
+ orderDetl.setLuHao(outDetTB.getLuHao());
+ orderDetl.setSpecs(outDetTB.getSPgNO());
+ orderDetl.setPacking(outDetTB.getPacking());
+ orderDetl.setWareId(outDetTB.getWareId());
+ orderDetl.setWareName(outDetTB.getWareName());
+ orderDetl.setBatch(outDetTB.getItemBatch());
+ orderDetl.setAnfme(outDetTB.getMainNum());
+ orderDetl.setINO(outDetTB.getINO());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setTemp1(outDetTB.getTemp1());
+ orderDetl.setTemp2(outDetTB.getTemp2());
+ orderDetl.setTemp3(outDetTB.getTemp3());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setThreeCode(outDetTB.getDetId() + "");
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ return true;
+ }
+
+
+ /**
+ * @return
+ */
+ @Transactional(rollbackFor = Throwable.class)
+ public boolean createOutOrder(OutHedTB inHedTB, List<OutDetTB> inDetTBs) {
+ Order order = orderService.selectByNo(inHedTB.getBillNo());
+ // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
+ if (!Cools.isEmpty(order)) {
+ if (order.getSettle() > 1L) {
+ throw new CoolException(inHedTB.getBillNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ }
+ orderService.remove(order.getId());
+ }
+ DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+ Date now = new Date();
+ // 鍗曟嵁涓绘。
+ order = new Order(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ inHedTB.getBillNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(inHedTB.getBillDate()), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ inHedTB.getObjectId(), // 瀹㈡埛缂栧彿
+ inHedTB.getObjectName(), // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9527L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9527L, // 淇敼浜哄憳
+ inHedTB.getMakeDate(), // 淇敼鏃堕棿
+ inHedTB.getRemark() // 澶囨敞
+ );
+ if (!orderService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ for (OutDetTB outDetTB : inDetTBs) {
+ Mat mat = matService.selectByMatnr(outDetTB.getItemCode());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(outDetTB.getItemCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ orderDetl.setOrderNo(outDetTB.getBillNo());
+ orderDetl.setOutOrderNo(outDetTB.getOrderNo());
+ orderDetl.setAutoId(outDetTB.getAutoId());
+ orderDetl.setLuHao(outDetTB.getLuHao());
+ orderDetl.setSpecs(outDetTB.getSPgNO());
+ orderDetl.setPacking(outDetTB.getPacking());
+ orderDetl.setWareId(outDetTB.getWareId());
+ orderDetl.setWareName(outDetTB.getWareName());
+ orderDetl.setBatch(outDetTB.getItemBatch());
+ orderDetl.setAnfme(outDetTB.getMainNum());
+ orderDetl.setINO(outDetTB.getINO());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setTemp1(outDetTB.getTemp1());
+ orderDetl.setTemp2(outDetTB.getTemp2());
+ orderDetl.setTemp3(outDetTB.getTemp3());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setThreeCode(outDetTB.getDetId() + "");
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ return true;
+ }
+}
+
+
+
+
+
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutTBSchedulerMS.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutTBSchedulerMS.java
deleted file mode 100644
index 35c657c..0000000
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutTBSchedulerMS.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package com.zy.third.erp.task;
-
-import com.core.common.Cools;
-import com.core.common.DateUtils;
-import com.core.common.SnowflakeIdWorker;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Mat;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.DocTypeService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
-import com.zy.common.model.DetlDto;
-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.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Slf4j
-@Component
-public class ERPInOrOutTBSchedulerMS {
-
-
- @Autowired
- private OrderService orderService;
-
- @Autowired
- private OrderDetlService orderDetlService;
-
-
- @Autowired
- private SnowflakeIdWorker snowflakeIdWorker;
-
-
- @Autowired
- private DocTypeService docTypeService;
-
-
- @Autowired
- private MatService matService;
-
-
- /**
- * @return
- */
- @Transactional
- public boolean createOrder(InHedTB inHedTB, List<InDetTB> inDetTBs) {
- Order order = orderService.selectByNo(inHedTB.getBillNo());
- // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
- if (!Cools.isEmpty(order)) {
- if (order.getSettle() > 1L) {
- throw new CoolException(inHedTB.getBillNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
- }
- orderService.remove(order.getId());
- }
- DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
- Date now = new Date();
- // 鍗曟嵁涓绘。
- order = new Order(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- inHedTB.getBillNo(), // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
- docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
- null, //
- null, // 璋冩嫧椤圭洰缂栧彿
- null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
- null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
- null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
- null, // 鍚堣閲戦
- null, // 浼樻儬鐜�
- null, // 浼樻儬閲戦
- null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
- null, // 瀹炰粯閲戦
- null, // 浠樻绫诲瀷
- null, // 涓氬姟鍛�
- null, // 缁撶畻澶╂暟
- null, // 閭垂鏀粯绫诲瀷
- null, // 閭垂
- null, // 浠樻鏃堕棿
- null, // 鍙戣揣鏃堕棿
- null, // 鐗╂祦鍚嶇О
- null, // 鐗╂祦鍗曞彿
- 1L, // 璁㈠崟鐘舵��
- 1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
- now, // 娣诲姞鏃堕棿
- 9527L, // 淇敼浜哄憳
- now, // 淇敼鏃堕棿
- null // 澶囨敞
- );
- if (!orderService.insert(order)) {
- throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- for (InDetTB detail : inDetTBs) {
- DetlDto dto = new DetlDto(detail.getBillNo(), detail.getItemBatch(), detail.getMainNum());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getMainNum());
- } else {
- list.add(dto);
- }
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
- if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- }
- return true;
- }
-
-}
-
-
-
-
-
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 b4b10c9..5d526de 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -7,6 +7,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -20,11 +21,14 @@
private Boolean erpEnabled;
@Autowired
- private ERPItemSchedulerMS erpItemSchedulerMS;
+ private ERPItemService erpItemService;
@Autowired
private ErpSqlServer erpSqlServer;
+
+
+ @Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void ItemScheduler() {
log.info("ItemScheduler寮�濮嬩簡");
@@ -36,11 +40,11 @@
System.out.println(itemTB);
//00浠ｈ〃鏂板
if (itemTB.getFlag().equals("00")) {
- erpItemSchedulerMS.addToMainDatabase(itemTB);
+ erpItemService.addToMainDatabase(itemTB);
}
//22浠ｈ〃鍒犻櫎
if (itemTB.getFlag().equals("22")) {
- erpItemSchedulerMS.deleteFromMainDatabase(itemTB);
+ erpItemService.deleteFromMainDatabase(itemTB);
}
moveToBak(itemTB);
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemSchedulerMS.java b/src/main/java/com/zy/third/erp/task/ERPItemService.java
similarity index 92%
rename from src/main/java/com/zy/third/erp/task/ERPItemSchedulerMS.java
rename to src/main/java/com/zy/third/erp/task/ERPItemService.java
index 3f415ef..58d4f88 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemSchedulerMS.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemService.java
@@ -20,7 +20,7 @@
@Slf4j
@Component
-public class ERPItemSchedulerMS {
+public class ERPItemService {
@Autowired
private MatService matService;
@@ -98,20 +98,16 @@
}
private Mat sync(Mat mat, ItemTB itemTB) {
- mat.setThreeCode(itemTB.getItemId());
+ mat.setUuid(itemTB.getItemId());
mat.setMatnr(itemTB.getItemCode());
mat.setMaktx(itemTB.getItemName());
mat.setSpecs(itemTB.getItemSpc());
mat.setUnit(itemTB.getItemUnit());
mat.setMemo(itemTB.getRemark());
mat.setCreateTime(itemTB.getMakeDate());
- mat.setAutoId(itemTB.getAutoId());
mat.setTemp1(itemTB.getTemp1());
mat.setTemp2(itemTB.getTemp2());
mat.setTemp3(itemTB.getTemp3());
- mat.setLuHao(itemTB.getLuHao());
- mat.setSPgNO(itemTB.getSPgNO());
- mat.setOutOrderNo(itemTB.getOrderNo());
return mat;
}
@@ -122,7 +118,7 @@
*/
protected void deleteFromMainDatabase(ItemTB itemTB) {
EntityWrapper<Mat> matCodeEntityWrapper = new EntityWrapper<>();
- matCodeEntityWrapper.eq("matnr", itemTB.getItemId());
+ matCodeEntityWrapper.eq("matnr", itemTB.getItemCode());
matMapper.delete(matCodeEntityWrapper);
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
new file mode 100644
index 0000000..9c154eb
--- /dev/null
+++ b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
@@ -0,0 +1,63 @@
+package com.zy.third.erp.task;
+
+import com.zy.common.service.erp.ErpSqlServer;
+import com.zy.third.erp.entity.InCancelTB;
+import com.zy.third.erp.entity.OutCancelTB;
+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 org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Slf4j
+@Component
+public class ERPOutCancelScheduler {
+
+ @Value("${erp.enabled}")
+ private Boolean erpEnabled;
+
+ @Autowired
+ private ERPInOrOutCancelService inMS;
+
+ @Autowired
+ private ErpSqlServer erpSqlServer;
+
+
+ @Transactional(rollbackFor = Throwable.class)
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void InCancelScheduler() {
+ log.info("InCancelScheduler寮�濮嬩簡");
+ if (!erpEnabled) return;
+ String sqlInCancelTB = "select * from erp_OutCancelTB where LKName='涓壃浜屾湡'";
+ List<OutCancelTB> ins = erpSqlServer.select(sqlInCancelTB, OutCancelTB.class);
+ for (OutCancelTB in : ins) {
+ System.out.println(in);
+ com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
+ if (lkCancel != null) {
+ HashMap<String, String> condition = new HashMap<>();
+ condition.put("BillNo", "'" + in.getBillNo() + "'");
+ int delete = erpSqlServer.delete(InCancelTB.class, condition);
+ if (delete > 0) {
+ log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゆ垚鍔�,{}", lkCancel.getBillNo());
+ } else {
+ log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゅけ璐�,{}", lkCancel.getBillNo());
+ }
+ HashMap<String, Object> content = new HashMap<>();
+ content.put("BillNo", "'" + lkCancel.getBillNo() + "'");
+ content.put("opFlag", lkCancel.getOpFlag());
+ int insert = erpSqlServer.insert(com.zy.third.lk.entity.InCancelTB.class, content);
+ if (insert > 0) {
+ log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ユ垚鍔�,{}", lkCancel.getBillNo());
+ } else {
+ log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�,{}", lkCancel.getBillNo());
+ }
+ } else {
+ log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�");
+ }
+ }
+ }
+}
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 c4b1f0b..ad54500 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -1,8 +1,8 @@
package com.zy.third.erp.task;
import com.zy.common.service.erp.ErpSqlServer;
-import com.zy.third.erp.entity.InDetTB;
-import com.zy.third.erp.entity.InHedTB;
+import com.zy.third.erp.entity.OutDetTB;
+import com.zy.third.erp.entity.OutHedTB;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -16,7 +16,8 @@
/**
* 鍏ュ簱鍗曟嵁
- */@Slf4j
+ */
+@Slf4j
@Component
public class ERPOutHedTBScheduler {
@@ -25,28 +26,30 @@
@Autowired
- private ERPInOrOutTBSchedulerMS inMS;
+ private ERPInOrOutService inMS;
@Autowired
private ErpSqlServer erpSqlServer;
+
+ @Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
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) {
+ List<OutHedTB> inHeds = erpSqlServer.select(sqlInHed, OutHedTB.class);
+ if (!inHeds.isEmpty()) {
+ for (OutHedTB 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);
+ List<OutDetTB> inDetTBS = erpSqlServer.selectList(OutDetTB.class, condition);
HashMap<String, Object> hedAndDet = new HashMap<>();
hedAndDet.put("hed", inHed);
hedAndDet.put("det", inDetTBS);
- boolean result = inMS.createOrder(inHed, inDetTBS);
+ boolean result = inMS.createOutOrder(inHed, inDetTBS);
if (result) {
move(hedAndDet);
} else {
@@ -57,20 +60,18 @@
}
}
- @Transactional
+ @Transactional(rollbackFor = Throwable.class)
public void move(HashMap<String, Object> hedAndDet) {
- InHedTB hed = (InHedTB) hedAndDet.get("hed");
- ArrayList<InDetTB> dets = (ArrayList<InDetTB>) hedAndDet.get("det");
+ OutHedTB hed = (OutHedTB) hedAndDet.get("hed");
+ ArrayList<OutDetTB> dets = (ArrayList<OutDetTB>) hedAndDet.get("det");
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + hed.getBillNo() + "'");
- erpSqlServer.delete(InHedTB.class, condition);
-
- for (InDetTB det : dets) {
+ erpSqlServer.delete(OutHedTB.class, condition);
+ for (OutDetTB det : dets) {
HashMap<String, String> condition2 = new HashMap<>();
condition2.put("BillNo", "'" + det.getBillNo() + "'");
condition2.put("iNo", String.valueOf(det.getINO()));
- erpSqlServer.delete(InDetTB.class, condition2);
-
+ erpSqlServer.delete(OutDetTB.class, condition2);
}
}
diff --git a/src/main/java/com/zy/third/lk/entity/ErpLKStorage.java b/src/main/java/com/zy/third/lk/entity/ErpLKStorage.java
index 4f715bb..985add0 100644
--- a/src/main/java/com/zy/third/lk/entity/ErpLKStorage.java
+++ b/src/main/java/com/zy/third/lk/entity/ErpLKStorage.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 io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
@@ -25,43 +26,43 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("WareId")
private String wareId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("WareName")
private String wareName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemId")
private String itemId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemCode")
private String itemCode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemName")
private String itemName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemSpc")
private String itemSpc;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemUnit")
private String itemUnit;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ProType")
private String protype;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ItemBatch")
private String itemBatch;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("NumIs")
private Double numis;
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 8167f18..7b3dc23 100644
--- a/src/main/java/com/zy/third/lk/entity/InDetTB.java
+++ b/src/main/java/com/zy/third/lk/entity/InDetTB.java
@@ -106,6 +106,35 @@
private Date makedate;
+ /**
+ *
+ */
+ @TableField("FactArea")
+ private String FactArea;
+ /**
+ * 渚涘簲鍟哱瀹㈡埛ID
+ */
+ @TableField("Packing")
+ private String Packing;
+ /**
+ * 棰滆壊
+ */
+ @TableField("sColor")
+ private String sColor;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("LuHao")
+ private String LuHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("sPgNO")
+ private String sPgNO;
+
+
public String getMakedate$() {
if (Cools.isEmpty(this.makedate)) {
return "";
diff --git a/src/main/java/com/zy/third/lk/entity/InDetTBBak.java b/src/main/java/com/zy/third/lk/entity/InDetTBBak.java
new file mode 100644
index 0000000..e569989
--- /dev/null
+++ b/src/main/java/com/zy/third/lk/entity/InDetTBBak.java
@@ -0,0 +1,142 @@
+package com.zy.third.lk.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.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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+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;
+
+@Data
+@TableName("lk_InDetTB_bak")
+public class InDetTBBak implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer autoId;
+
+ @ApiModelProperty(value = "")
+ @TableField("BillNo")
+ private String BillNo;
+
+ @ApiModelProperty(value = "")
+ @TableField("iNo")
+ private Integer iNO;
+
+ @ApiModelProperty(value = "")
+ @TableField("DetId")
+ private Integer detId;
+
+ @ApiModelProperty(value = "")
+ @TableField("ItemId")
+ private String itemid;
+
+ @ApiModelProperty(value = "")
+ @TableField("ItemCode")
+ private String ItemCode;
+
+ @ApiModelProperty(value = "")
+ @TableField("ItemBatch")
+ private String ItemBatch;
+
+ @ApiModelProperty(value = "")
+ @TableField("proType")
+ private String protype;
+
+ @ApiModelProperty(value = "")
+ @TableField("OrderNo")
+ private String OrderNo;
+
+ @ApiModelProperty(value = "")
+ @TableField("MainNum")
+ private Double MainNum;
+
+ @ApiModelProperty(value = "")
+ @TableField("remark")
+ private String remark;
+
+ @TableField("WareId")
+ private String wareId;
+
+ @TableField("WareName")
+ private String wareName;
+
+ @ApiModelProperty(value = "")
+ private String temp1;
+
+ @ApiModelProperty(value = "")
+ private String temp2;
+
+ @ApiModelProperty(value = "")
+ private String temp3;
+
+
+ @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")
+ private Date DelDate;
+
+ /**
+ *
+ */
+ @TableField("FactArea")
+ private String FactArea;
+ /**
+ * 渚涘簲鍟哱瀹㈡埛ID
+ */
+ @TableField("Packing")
+ private String Packing;
+ /**
+ * 棰滆壊
+ */
+ @TableField("sColor")
+ private String sColor;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("LuHao")
+ private String LuHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("sPgNO")
+ private String sPgNO;
+
+ public String getMakedate$() {
+ if (Cools.isEmpty(this.makedate)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/third/lk/entity/InHedTBBak.java b/src/main/java/com/zy/third/lk/entity/InHedTBBak.java
new file mode 100644
index 0000000..69bb639
--- /dev/null
+++ b/src/main/java/com/zy/third/lk/entity/InHedTBBak.java
@@ -0,0 +1,118 @@
+package com.zy.third.lk.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.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.Data;
+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;
+
+@Data
+@TableName("lk_InHedTB_bak")
+public class InHedTBBak implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer autoId;
+
+ @ApiModelProperty(value = "")
+ @TableField("BillNo")
+ private String BillNo;
+
+ @TableField("BillDate")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date billDate;
+
+ /**
+ * StockIn:閲囪喘鍏ュ簱
+ * ProductIn:鎴愬搧鍏ュ簱鍗�
+ * ItemMoveIn:璋冩嫧鍏ュ簱
+ * ItemSwitchIn:褰㈡�佽浆鎹㈠叆搴�
+ * CheckMoreIn:鐩樼泩鍏ュ簱鍗�
+ */
+ @ApiModelProperty(value = "StockIn:閲囪喘鍏ュ簱 ")
+ @TableField("IoKindID")
+ private String IoKindID;
+
+ @TableField("IoKindName")
+ private String ioKindName;
+
+ /**
+ * 渚涘簲鍟嗐�侀儴闂↖D
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂↖D")
+ @TableField("ObjectId")
+ private String ObjectId;
+
+ /**
+ * 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
+ */
+ @ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
+ @TableField("ObjectName")
+ private String ObjectName;
+
+ @ApiModelProperty(value = "")
+ @TableField("Remark")
+ private String remark;
+
+ @TableField("WareId")
+ private String wareId;
+
+ @TableField("WareName")
+ private String wareName;
+
+ @ApiModelProperty(value = "")
+ @TableField("Temp1")
+ private String temp1;
+
+ @ApiModelProperty(value = "")
+ @TableField("Temp2")
+ private String temp2;
+
+ @ApiModelProperty(value = "")
+ @TableField("Temp3")
+ private String temp3;
+
+ @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")
+ private Date delDate;
+
+
+ @TableField("bPass")
+ private Boolean bPass;
+
+ @TableField("bStartIn")
+ private Boolean bStartIn;
+
+ public String getMakedate$() {
+ if (Cools.isEmpty(this.makedate)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.makedate);
+ }
+
+
+}
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 fffa5d1..4d34e05 100644
--- a/src/main/java/com/zy/third/lk/entity/OutDetTB.java
+++ b/src/main/java/com/zy/third/lk/entity/OutDetTB.java
@@ -21,7 +21,7 @@
@Data
@NoArgsConstructor
@AllArgsConstructor
-@TableName("lk_OutDetTb")
+@TableName("lk_OutDetTB")
public class OutDetTB implements Serializable {
private static final long serialVersionUID = 1L;
@@ -94,6 +94,34 @@
@TableField("DelDate")
private Date delDate;
+ /**
+ *
+ */
+ @TableField("FactArea")
+ private String FactArea;
+ /**
+ * 渚涘簲鍟哱瀹㈡埛ID
+ */
+ @TableField("Packing")
+ private String Packing;
+ /**
+ * 棰滆壊
+ */
+ @TableField("sColor")
+ private String sColor;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("LuHao")
+ private String LuHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("sPgNO")
+ private String sPgNO;
+
public String getMakedate$() {
if (Cools.isEmpty(this.makedate)) {
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 a3138d6..b392334 100644
--- a/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutDetTBBak.java
@@ -9,13 +9,15 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
-@TableName("lk_OutDetTb_bak")
+@TableName("lk_OutDetTB_bak")
+@Data
public class OutDetTBBak implements Serializable {
private static final long serialVersionUID = 1L;
@@ -87,6 +89,33 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date delDate;
+ /**
+ *
+ */
+ @TableField("FactArea")
+ private String FactArea;
+ /**
+ * 渚涘簲鍟哱瀹㈡埛ID
+ */
+ @TableField("Packing")
+ private String Packing;
+ /**
+ * 棰滆壊
+ */
+ @TableField("sColor")
+ private String sColor;
+
+ /**
+ * 鐐夊彿\瀹㈡埛鍥惧彿
+ */
+ @TableField("LuHao")
+ private String LuHao;
+
+ /**
+ * 宸ュ崟鍙�
+ */
+ @TableField("sPgNO")
+ private String sPgNO;
public String getMakedate$() {
if (Cools.isEmpty(this.makedate)) {
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 69dd714..aa916ec 100644
--- a/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.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_OutHedTb_bak")
@@ -18,10 +20,10 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "AutoId",type = IdType.AUTO)
+ @TableId(value = "AutoId", type = IdType.AUTO)
private Integer AutoId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("BillNo")
private String BillNo;
@@ -30,28 +32,27 @@
/**
* 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 ObjectId;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ObjectName")
private String ObjectName;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Remark")
private String Remark;
@@ -61,21 +62,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;
@@ -89,15 +90,12 @@
private Boolean bStartIn;
-
- 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);
}
-
-
}
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 d118af8..a7de595 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -1,19 +1,15 @@
package com.zy.third.lk.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
-import com.zy.common.model.DetlDto;
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.third.lk.entity.*;
import lombok.extern.slf4j.Slf4j;
@@ -22,9 +18,9 @@
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 鍏ュ簱鏇存柊瀹屾垚鍥炴姤
@@ -48,7 +44,7 @@
@Autowired
private ErpSqlServer erpSqlServer;
- @Transactional
+ @Transactional(rollbackFor = Throwable.class)
@Scheduled(cron = "${erp.refreshtime}")
public void pakinOrderComplete() {
log.info("寮�濮嬪叆搴撴洿鏂板畬鎴愬洖鎶�");
@@ -90,38 +86,27 @@
* @param orderDetl
* @return
*/
- @Transactional
+ @Transactional(rollbackFor = Throwable.class)
public boolean insertInDet(OrderDetl orderDetl) {
String sqlInDetTb = "select * from lk_InDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " +
" ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
List<InDetTB> inDets = erpSqlServer.select(sqlInDetTb, InDetTB.class);
String sqlInDetTbBak = "select * from lk_InDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " +
" ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
- List<InDetTB> inDetBaks = erpSqlServer.select(sqlInDetTbBak, InDetTB.class);
- if (inDets.size() > 0 || inDetBaks.size() > 0) {
+ List<InDetTBBak> inDetBaks = erpSqlServer.select(sqlInDetTbBak, InDetTBBak.class);
+ if (!inDets.isEmpty() || !inDetBaks.isEmpty()) {
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
return true;
}
Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
- HashMap<String, Object> content = new HashMap<>();
- content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
- content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
- content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
- content.put("proType", "'" + orderDetl.getSpecs() + "'");
- content.put("remark", "'" + orderDetl.getMemo() + "'");
- content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'");
- content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
- content.put("iNo", orderDetl.getId());
- content.put("DetId", orderDetl.getAutoId());
- content.put("MainNum", orderDetl.getQty());
- content.put("LKName", "'涓壃浜屾湡'");
+ Map<String, Object> content = getMap(orderDetl);
int insert = erpSqlServer.insert(InDetTB.class, content);
if (insert == 1) {
- log.info("鍏ュ簱鍗曡〃韬洖浼犳垚鍔�:" + content.toString());
+ log.info("鍏ュ簱鍗曡〃韬洖浼犳垚鍔�:{}", content);
return true;
} else {
- log.error("鍏ュ簱鍥炰紶澶辫触,瀹炰綋绫绘墦鍗�:" + content.toString());
+ log.error("鍏ュ簱鍥炰紶澶辫触,瀹炰綋绫绘墦鍗�:{}", content);
return false;
}
@@ -133,13 +118,13 @@
* @param order
* @return
*/
- @Transactional
+ @Transactional(rollbackFor = Throwable.class)
public boolean insertInHed(Order order) {
String sqlInHedTb = "select * from lk_InHedTB where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
List<InHedTB> outHeds = erpSqlServer.select(sqlInHedTb, InHedTB.class);
String sqlInHedTbBak = "select * from lk_InHedTB_Bak where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
- List<InHedTB> inHedBaks = erpSqlServer.select(sqlInHedTbBak, InHedTB.class);
- if (outHeds.size() > 0 || inHedBaks.size() > 0) {
+ List<InHedTBBak> inHedBaks = erpSqlServer.select(sqlInHedTbBak, InHedTBBak.class);
+ if (!outHeds.isEmpty() || !inHedBaks.isEmpty()) {
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
return true;
}
@@ -149,15 +134,15 @@
content.put("ObjectId", "'" + order.getCstmr() + "'");
content.put("ObjectName", "'" + order.getCstmrName() + "'");
content.put("Remark", "'" + order.getMemo() + "'");
- content.put("LKName", "'涓壃'");
+ content.put("LKName", "'涓壃浜屾湡'");
int insert = erpSqlServer.insert(InHedTB.class, content);
String sql = "UPDATE lk_InHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
int update = erpSqlServer.update(sql);
if (update == 1) {
- log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content.toString());
+ log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content);
return true;
} else {
- log.error("鍏ュ簱鍗曡〃澶村洖浼犲け璐�:" + content.toString());
+ log.error("鍏ュ簱鍗曡〃澶村洖浼犲け璐�:" + content);
return false;
}
}
@@ -168,7 +153,7 @@
* @param orderDetl
* @return
*/
- @Transactional
+ @Transactional(rollbackFor = Throwable.class)
public boolean insertOutDet(OrderDetl orderDetl) {
String sqlInDetTb = "select * from lk_OutDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " +
" ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
@@ -176,23 +161,12 @@
String sqlInDetTbBak = "select * from lk_OutDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " +
" ItemId='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'";
List<OutDetTBBak> inDetBaks = erpSqlServer.select(sqlInDetTbBak, OutDetTBBak.class);
- if (inDets.size() > 0 || inDetBaks.size() > 0) {
+ if (!inDets.isEmpty() || !inDetBaks.isEmpty()) {
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo());
return true;
}
Mat mat = matService.selectByMatnr(orderDetl.getMatnr());
- HashMap<String, Object> content = new HashMap<>();
- content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
- content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
- content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
- content.put("proType", "'" + orderDetl.getSpecs() + "'");
- content.put("remark", "'" + orderDetl.getMemo() + "'");
- content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'");
- content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
- content.put("iNo", orderDetl.getId());
- content.put("DetId", orderDetl.getAutoId());
- content.put("MainNum", orderDetl.getQty());
- content.put("LKName", "'涓壃浜屾湡'");
+ Map<String, Object> content = getMap(orderDetl);
int insert = erpSqlServer.insert(InDetTB.class, content);
if (insert == 1) {
@@ -211,13 +185,13 @@
* @param order
* @return
*/
- @Transactional
+ @Transactional(rollbackFor = Throwable.class)
public boolean insertOutHed(Order order) {
String sqlInHedTb = "select * from lk_OutHedTB where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
List<OutHedTB> outHeds = erpSqlServer.select(sqlInHedTb, OutHedTB.class);
String sqlInHedTbBak = "select * from lk_OutHedTB_Bak where LKName='涓壃浜屾湡' and BillNo='" + order.getOrderNo() + "'";
List<OutHedTBBak> inHedBaks = erpSqlServer.select(sqlInHedTbBak, OutHedTBBak.class);
- if (outHeds.size() > 0 || inHedBaks.size() > 0) {
+ if (!outHeds.isEmpty() || !inHedBaks.isEmpty()) {
log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo());
return true;
}
@@ -227,16 +201,40 @@
content.put("ObjectId", "'" + order.getCstmr() + "'");
content.put("ObjectName", "'" + order.getCstmrName() + "'");
content.put("Remark", "'" + order.getMemo() + "'");
- content.put("LKName", "'涓壃'");
- int insert = erpSqlServer.insert(InHedTB.class, content);
- String sql = "UPDATE lk_InHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
+ content.put("LKName", "'涓壃浜屾湡'");
+ int insert = erpSqlServer.insert(OutHedTB.class, content);
+ String sql = "UPDATE lk_OutHedTB SET bPass = 1, LKName='涓壃浜屾湡' WHERE BillNo = '" + order.getOrderNo() + "'";
int update = erpSqlServer.update(sql);
if (update == 1) {
- log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content.toString());
+ log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content);
return true;
} else {
- log.error("鍏ュ簱鍗曡〃澶村洖浼犲け璐�:" + content.toString());
+ log.error("鍏ュ簱鍗曡〃澶村洖浼犲け璐�:" + content);
return false;
}
}
+
+ private Map<String, Object> getMap(OrderDetl orderDetl) {
+ Map<String, Object> content = new HashMap<>();
+ content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
+ content.put("iNO", "'" + orderDetl.getINO() + "'");
+ content.put("detId", orderDetl.getThreeCode());
+ content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
+ content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
+ content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
+ content.put("proType", "'" + orderDetl.getProType() + "'");
+ content.put("remark", "'" + orderDetl.getMemo() + "'");
+ content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'");
+ content.put("MainNum", orderDetl.getQty());
+ content.put("WareId", "'" + orderDetl.getWareId() + "'");
+ content.put("WareName", "'" + orderDetl.getWareName() + "'");
+ content.put("Packing", "'" + orderDetl.getPacking() + "'");
+ content.put("LuHao", "'" + orderDetl.getLuHao() + "'");
+ content.put("sPgNO", "'" + orderDetl.getSPgNO() + "'");
+ content.put("temp1", "'" + orderDetl.getTemp1() + "'");
+ content.put("temp2", "'" + orderDetl.getTemp2() + "'");
+ content.put("temp3", "'" + orderDetl.getTemp3() + "'");
+ content.put("LKName", "'涓壃浜屾湡'");
+ return content;
+ }
}
diff --git a/src/main/java/update20240719.sql b/src/main/java/update20240719.sql
new file mode 100644
index 0000000..f67ce10
--- /dev/null
+++ b/src/main/java/update20240719.sql
@@ -0,0 +1,168 @@
+ALTER TABLE [dbo].[man_mat] ADD [temp1] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_mat] ADD [temp2] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_mat] ADD [temp3] varchar(255) NULL
+
+
+ALTER TABLE [dbo].[man_order] ALTER COLUMN [cstmr] varchar(50) NULL
+
+ALTER TABLE [dbo].[man_order_log] ALTER COLUMN [cstmr] varchar(50) NULL
+
+
+ALTER TABLE [dbo].[man_order_detl] ADD [auto_id] int NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [out_order_no] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [lu_hao] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [ware_id] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [ware_name] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [packing] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [pg_no] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [temp1] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [temp2] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [temp3] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl] ADD [pro_type] varchar(255) NULL
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'澶栭儴涓婚敭id',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'auto_id'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'璁㈠崟鍙� ',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'out_order_no'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'鐐夊彿\瀹㈡埛鍥惧彿',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'lu_hao'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'浠撳簱ID',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'ware_id'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'浠撳簱',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'ware_name'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'渚涘簲鍟哱瀹㈡埛ID',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'packing'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'宸ュ崟鍙�',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'pg_no'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'澶囩敤瀛楁',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'temp1'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'澶囩敤瀛楁',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'temp2'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'澶囩敤瀛楁',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'temp3'
+ GO
+
+ EXEC sp_addextendedproperty
+ 'MS_Description', N'灞炴��',
+ 'SCHEMA', N'dbo',
+ 'TABLE', N'man_order_detl',
+ 'COLUMN', N'pro_type'
+
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [auto_id] int NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [out_order_no] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [lu_hao] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [ware_id] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [ware_name] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [packing] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [pg_no] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [temp1] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [temp2] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [temp3] varchar(255) NULL
+ GO
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [pro_type] varchar(255) NULL
+ GO
+
+
+
+
+ALTER TABLE [dbo].[man_doc_type] ADD [doc_code] varchar(255) NULL
+
+
+
+ALTER TABLE [dbo].[man_order_detl] ADD [i_no] int NULL
+
+
+ALTER TABLE [dbo].[man_order_detl_log] ADD [i_no] int NULL
\ No newline at end of file
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index 74ebaf0..ce8f4fa 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -200,4 +200,10 @@
</choose>
</update>
+
+ <select id="listByOrderNo" resultMap="BaseResultMap">
+ select * from man_order_detl
+ where 1=1
+ and order_no = #{orderNo}
+ </select>
</mapper>
--
Gitblit v1.9.1