From 5e89cb64a5cc8c60d22aa477799112e4b0d60157 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 04 一月 2023 16:53:23 +0800 Subject: [PATCH] #显示优化 --- src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 2 src/main/java/com/zy/ints/entity/ErpLkBak.java | 14 ++++ src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 4 src/main/java/com/zy/ints/entity/PrdtBak.java | 14 ++++ src/main/java/com/zy/ints/entity/LkDetTb.java | 14 ++++ src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java | 36 +++++++---- src/main/java/com/zy/ints/entity/ErpDetTb.java | 14 ++++ src/main/java/com/zy/ints/entity/ErpLk.java | 14 ++++ src/main/java/com/zy/ints/entity/LkDetTbBak.java | 14 ++++ src/main/java/com/zy/ints/entity/ErpDetTbBak.java | 14 ++++ src/main/java/com/zy/ints/entity/Prdt.java | 14 ++++ src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 2 12 files changed, 139 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/zy/ints/entity/ErpDetTb.java b/src/main/java/com/zy/ints/entity/ErpDetTb.java index 5486cfa..f7997d6 100644 --- a/src/main/java/com/zy/ints/entity/ErpDetTb.java +++ b/src/main/java/com/zy/ints/entity/ErpDetTb.java @@ -166,4 +166,18 @@ } } + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 0: + return "0(鍒濆鐘舵��)"; + case 1: + return "1(宸叉帴鏀�)"; + case 2: + return "2(寮傚父)"; + default: + return String.valueOf(this.status); + } + } + } diff --git a/src/main/java/com/zy/ints/entity/ErpDetTbBak.java b/src/main/java/com/zy/ints/entity/ErpDetTbBak.java index 4f7bec3..8838afc 100644 --- a/src/main/java/com/zy/ints/entity/ErpDetTbBak.java +++ b/src/main/java/com/zy/ints/entity/ErpDetTbBak.java @@ -146,5 +146,19 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate); } + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 0: + return "0(鍒濆鐘舵��)"; + case 1: + return "1(宸叉帴鏀�)"; + case 2: + return "2(寮傚父)"; + default: + return String.valueOf(this.status); + } + } + } diff --git a/src/main/java/com/zy/ints/entity/ErpLk.java b/src/main/java/com/zy/ints/entity/ErpLk.java index 6fd3600..f70be53 100644 --- a/src/main/java/com/zy/ints/entity/ErpLk.java +++ b/src/main/java/com/zy/ints/entity/ErpLk.java @@ -94,5 +94,19 @@ // null // 澶囩敤瀛楁3 // ); + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 0: + return "0(鍒濆鐘舵��)"; + case 1: + return "1(宸叉帴鏀�)"; + case 2: + return "2(寮傚父)"; + default: + return String.valueOf(this.status); + } + } + } diff --git a/src/main/java/com/zy/ints/entity/ErpLkBak.java b/src/main/java/com/zy/ints/entity/ErpLkBak.java index 95198a1..3399fe8 100644 --- a/src/main/java/com/zy/ints/entity/ErpLkBak.java +++ b/src/main/java/com/zy/ints/entity/ErpLkBak.java @@ -93,5 +93,19 @@ // null // 澶囩敤瀛楁3 // ); + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 0: + return "0(鍒濆鐘舵��)"; + case 1: + return "1(宸叉帴鏀�)"; + case 2: + return "2(寮傚父)"; + default: + return String.valueOf(this.status); + } + } + } diff --git a/src/main/java/com/zy/ints/entity/LkDetTb.java b/src/main/java/com/zy/ints/entity/LkDetTb.java index 8d67e07..694975f 100644 --- a/src/main/java/com/zy/ints/entity/LkDetTb.java +++ b/src/main/java/com/zy/ints/entity/LkDetTb.java @@ -146,5 +146,19 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate); } + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 0: + return "0(鍒濆鐘舵��)"; + case 1: + return "1(宸叉帴鏀�)"; + case 2: + return "2(寮傚父)"; + default: + return String.valueOf(this.status); + } + } + } diff --git a/src/main/java/com/zy/ints/entity/LkDetTbBak.java b/src/main/java/com/zy/ints/entity/LkDetTbBak.java index fe9be8c..f21d57a 100644 --- a/src/main/java/com/zy/ints/entity/LkDetTbBak.java +++ b/src/main/java/com/zy/ints/entity/LkDetTbBak.java @@ -146,5 +146,19 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.billdate); } + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 0: + return "0(鍒濆鐘舵��)"; + case 1: + return "1(宸叉帴鏀�)"; + case 2: + return "2(寮傚父)"; + default: + return String.valueOf(this.status); + } + } + } diff --git a/src/main/java/com/zy/ints/entity/Prdt.java b/src/main/java/com/zy/ints/entity/Prdt.java index 03c8766..b9cca72 100644 --- a/src/main/java/com/zy/ints/entity/Prdt.java +++ b/src/main/java/com/zy/ints/entity/Prdt.java @@ -76,5 +76,19 @@ // null // 鐘舵�乕闈炵┖] // ); + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 0: + return "0(鍒濆鐘舵��)"; + case 1: + return "1(宸叉帴鏀�)"; + case 2: + return "2(寮傚父)"; + default: + return String.valueOf(this.status); + } + } + } diff --git a/src/main/java/com/zy/ints/entity/PrdtBak.java b/src/main/java/com/zy/ints/entity/PrdtBak.java index 3912120..72cb63c 100644 --- a/src/main/java/com/zy/ints/entity/PrdtBak.java +++ b/src/main/java/com/zy/ints/entity/PrdtBak.java @@ -75,5 +75,19 @@ // null // 鐘舵�乕闈炵┖] // ); + public String getStatus$(){ + if (null == this.status){ return null; } + switch (this.status){ + case 0: + return "0(鍒濆鐘舵��)"; + case 1: + return "1(宸叉帴鏀�)"; + case 2: + return "2(寮傚父)"; + default: + return String.valueOf(this.status); + } + } + } diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java index 9a11f89..79f1b65 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java @@ -194,7 +194,7 @@ public void callApiLogSave(ErpDetTb erpDetTb, String tableName, String response, Boolean bool) { apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", tableName, "null", ip, - "璁㈠崟鍙凤細" + erpDetTb.getBillNo() + "銆佸搧鍙凤細" + erpDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpDetTb.getPrdMark() + "銆佺姸鎬侊細" + erpDetTb.getStatus(), + "璁㈠崟鍙凤細" + erpDetTb.getBillNo() + "銆佸搧鍙凤細" + erpDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpDetTb.getPrdMark() + "銆佺姸鎬侊細" + erpDetTb.getStatus$(), response, bool); } } diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java index ce02456..e5e7c3f 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java @@ -46,8 +46,10 @@ public void proofread() { if (!erpEnabled) return; String sqlSelectErpLk = "select prd_no as prdNo,prd_mark as prdMark,qty,wh,status,temp1,temp2,temp3 from bas_erp_lk where 1=1"; + String sqlSelectErpLkBak = "select prd_no as prdNo,prd_mark as prdMark,qty,wh,status,temp1,temp2,temp3 from bas_erp_lk_bak where 1=1"; String sqlUpDateErpLkOne = "update bas_erp_lk set status=1 where prd_no="; String sqlUpDateErpLkTwo = "update bas_erp_lk set status=2 where prd_no="; + String sqlUpDateErpLkBak = "update bas_erp_lk_bak set qty="; try { List<ErpLk> erpLks = erpSqlServer.select(sqlSelectErpLk, ErpLk.class); @@ -75,24 +77,32 @@ callApiLogSave(erpLk, "bas_erp_lk", "绔嬪簱搴撳瓨寮傚父锛侊紒锛佺浉鍚屽搧鍙枫�佽揣鍝佺壒寰佺殑璐х墿閲嶅锛侊紒锛�", false); } } else if (status == 1) { - HashMap<String, Object> condition = new HashMap<>(); - condition.put("prd_no", "'" + erpLk.getPrdNo() + "'"); - condition.put("prd_mark", "'" + erpLk.getPrdMark() + "'"); - condition.put("qty", "'" + erpLk.getQty() + "'"); - condition.put("wh", "'" + erpLk.getWh() + "'"); - condition.put("status", "'" + erpLk.getStatus() + "'"); - condition.put("temp1", "'" + erpLk.getTemp1() + "'"); - condition.put("temp2", "'" + erpLk.getTemp2() + "'"); - condition.put("temp3", "'" + erpLk.getTemp3() + "'"); - erpSqlServer.insert(ErpLkBak.class, condition); - + List<ErpLkBak> erpLkBaks = erpSqlServer.select(sqlSelectErpLkBak + " and prd_no='" + erpLk.getPrdNo() + "' and prd_mark='" + erpLk.getPrdMark() + "'", ErpLkBak.class); + if (erpLkBaks.size() == 1) { + erpSqlServer.update(sqlUpDateErpLkBak + "'" + erpLk.getQty() + "' where 1=1 " + + "and prd_no='" + erpLk.getPrdNo() + "'" + + "and prd_mark='" + erpLk.getPrdMark() + "'" + ); + } else if (erpLkBaks.size() == 0) { + HashMap<String, Object> condition = new HashMap<>(); + condition.put("prd_no", "'" + erpLk.getPrdNo() + "'"); + condition.put("prd_mark", "'" + erpLk.getPrdMark() + "'"); + condition.put("qty", "'" + erpLk.getQty() + "'"); + condition.put("wh", "'" + erpLk.getWh() + "'"); + condition.put("status", "'" + erpLk.getStatus() + "'"); + condition.put("temp1", "'" + erpLk.getTemp1() + "'"); + condition.put("temp2", "'" + erpLk.getTemp2() + "'"); + condition.put("temp3", "'" + erpLk.getTemp3() + "'"); + erpSqlServer.insert(ErpLkBak.class, condition); + } else { + callApiLogSave(erpLk, "bas_erp_lk", "搴撳瓨瀵规瘮璁板綍澶囦唤瀛樺湪寮傚父锛侊紒锛�", false); + } // callApiLogSave(erpLk, "bas_erp_lk", "搴撳瓨瀵规瘮璁板綍澶囦唤鎴愬姛锛侊紒锛佹�婚噺涓猴細" + erpLk.getQty(), true); HashMap<String, String> condition2 = new HashMap<>(); condition2.put("prd_no", "'" + erpLk.getPrdNo() + "'"); condition2.put("prd_mark", "'" + erpLk.getPrdMark() + "'"); erpSqlServer.delete(ErpLk.class, condition2); - // callApiLogSave(erpLk, "bas_erp_lk", "搴撳瓨瀵规瘮璁板綍澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛侊紒鎬婚噺涓猴細" + erpLk.getQty(), true); } else { @@ -108,7 +118,7 @@ public void callApiLogSave(ErpLk erpLk, String tableName, String response, Boolean bool) { apiLogService.save("ERP涓巐k搴撳瓨鏁版嵁姣斿", tableName, "null", ip, - "鍝佸彿锛�" + erpLk.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpLk.getPrdMark() + "銆佹暟閲忥細" + erpLk.getQty() + "銆佺姸鎬侊細" + erpLk.getStatus(), + "鍝佸彿锛�" + erpLk.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpLk.getPrdMark() + "銆佹暟閲忥細" + erpLk.getQty() + "銆佺姸鎬侊細" + erpLk.getStatus$(), response, bool); } } diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java index 911362f..0231f2b 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java @@ -141,7 +141,7 @@ public void callApiLogSave(Prdt prdt, String tableName, String response, Boolean bool) { apiLogService.save("ERP涓嬪彂鍟嗗搧淇℃伅", tableName, "null", ip, - "鍝佸彿锛�" + prdt.getPrdNo() + "銆佸搧鍚嶏細" + prdt.getName() + "銆佺被鍨嬶細" + prdt.getType() + "銆佺姸鎬侊細" + prdt.getStatus(), + "鍝佸彿锛�" + prdt.getPrdNo() + "銆佸搧鍚嶏細" + prdt.getName() + "銆佺被鍨嬶細" + prdt.getType() + "銆佺姸鎬侊細" + prdt.getStatus$(), response, bool); } } diff --git a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java index 5e840c8..2c347f3 100644 --- a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java @@ -135,13 +135,13 @@ public void callApiLogSaveLkDetTb(LkDetTb lkDetTb, String tableName, String response, Boolean bool) { apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", tableName, "null", ip, - "璁㈠崟鍙凤細" + lkDetTb.getBillNo() + "銆佸搧鍙凤細" + lkDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTb.getPrdMark() + "銆佺姸鎬侊細" + lkDetTb.getStatus(), + "璁㈠崟鍙凤細" + lkDetTb.getBillNo() + "銆佸搧鍙凤細" + lkDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTb.getPrdMark() + "銆佺姸鎬侊細" + lkDetTb.getStatus$(), response, bool); } public void callApiLogSaveLkDetTbBak(LkDetTbBak lkDetTbBak, String tableName, String response, Boolean bool) { apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", tableName, "null", ip, - "璁㈠崟鍙凤細" + lkDetTbBak.getBillNo() + "銆佸搧鍙凤細" + lkDetTbBak.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTbBak.getPrdMark() + "銆佺姸鎬侊細" + lkDetTbBak.getStatus(), + "璁㈠崟鍙凤細" + lkDetTbBak.getBillNo() + "銆佸搧鍙凤細" + lkDetTbBak.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + lkDetTbBak.getPrdMark() + "銆佺姸鎬侊細" + lkDetTbBak.getStatus$(), response, bool); } -- Gitblit v1.9.1