From 2fe8875acf7d4fb9f8e088a7747798040a2b8aa0 Mon Sep 17 00:00:00 2001 From: 18516761980 <tqsxp@163.com> Date: 星期五, 03 二月 2023 19:46:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 72 ++++++++++++++++++----------------- 1 files changed, 37 insertions(+), 35 deletions(-) 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 75d950a..7fca83c 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java @@ -3,7 +3,6 @@ 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; @@ -35,6 +34,8 @@ */ @Value("${erp.enabled}") private Boolean erpEnabled; + @Value("${erp.enabledErpDetTb}") + private Boolean erpEnabledErpDetTb; @Value("${erp.useName.ip}") private String ip; @Autowired @@ -57,10 +58,10 @@ */ @Scheduled(cron = "${erp.refreshtime}") public void InOrOutOrder() { - if (!erpEnabled) return; - String sqlSelectErpDetTb = "select bill_no as billNo,prd_no as prdNo,iokindid,add_id as addId,qty,prd_mark as prdMark,wh,billdate,status,temp1,temp2,temp3 from erp_det_tb where 1=1"; - String sqlUpDateErpDetTbOne = "update erp_det_tb set status=1 where 1=1 and prd_no="; - String sqlUpDateErpDetTbTwo = "update erp_det_tb set status=2 "; + if (!erpEnabledErpDetTb) return; + String sqlSelectErpDetTb = "select BIL_NO as billNo,prd_no as prdNo,ITM as itm,ADD_ID as addId2,QTY as qty,PRD_MARK as prdMark,WH as wh,BIL_DATE as billdate,STATUS as status,Temp1 as temp1,Temp2 as temp2,Temp3 as temp3 from ERP_DETTB where 1=1"; + String sqlUpDateErpDetTbOne = "update ERP_DETTB set STATUS=1 where 1=1 and PRD_NO="; + String sqlUpDateErpDetTbTwo = "update ERP_DETTB set STATUS=2 "; try { List<ErpDetTb> erpDetTbs = erpSqlServer.select(sqlSelectErpDetTb, ErpDetTb.class); @@ -71,8 +72,8 @@ if (status == 0) { Mat mat = matService.selectByMatnr(erpDetTb.getPrdNo()); if (Cools.isEmpty(mat)) { - erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒'" + "where 1=1 and prd_no=" + "'" + erpDetTb.getPrdNo() + "'"); - callApiLogSave(erpDetTb, "erp_det_tb", "鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒", false); + erpSqlServer.update(sqlUpDateErpDetTbTwo + ",Temp1='鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒'" + "where 1=1 and PRD_NO=" + "'" + erpDetTb.getPrdNo() + "'"); + callApiLogSave(erpDetTb, "ERP_DETTB", "鍝佸彿淇℃伅鍦ㄧ珛搴撲笉瀛樺湪锛岃鍏堟坊鍔犲晢鍝侊紒锛侊紒", false); } else { Order order = orderService.selectByNo(erpDetTb.getBillNo()); if (Cools.isEmpty(order)) { @@ -112,15 +113,15 @@ now, // 淇敼鏃堕棿 null // 澶囨敞 ); - String InAndOut = erpDetTb.getAddId().equals("2") ? "锛堝嚭搴擄級" : "锛堝叆搴擄級"; - DocType docType = docTypeService.selectOrAdd(erpDetTb.getIokindid$() + InAndOut, erpDetTb.getAddId().equals("1")); + String InAndOut = erpDetTb.getAddId2()==2 ? "锛堝嚭搴擄級" : "锛堝叆搴擄級"; + DocType docType = docTypeService.selectOrAdd("ERP璁㈠崟"+InAndOut, erpDetTb.getAddId2()==1); if (!Cools.isEmpty(docType)) { order.setDocType(docType.getDocId()); if (!orderService.insert(order)) { - callApiLogSave(erpDetTb, "erp_det_tb", "璁㈠崟涓绘。娣诲姞澶辫触锛侊紒", false); + callApiLogSave(erpDetTb, "ERP_DETTB", "璁㈠崟涓绘。娣诲姞澶辫触锛侊紒", false); continue; } else { - callApiLogSave(erpDetTb, "erp_det_tb", "璁㈠崟涓绘。娣诲姞鎴愬姛锛侊紒", true); + callApiLogSave(erpDetTb, "ERP_DETTB", "璁㈠崟涓绘。娣诲姞鎴愬姛锛侊紒", true); } } } @@ -147,10 +148,10 @@ orderDetl.setMemo(erpDetTb.getWh()); if (orderDetlService.insert(orderDetl)) { erpSqlServer.update(sqlUpDateErpDetTbOne + "'" + erpDetTb.getPrdNo() + "'"); - callApiLogSave(erpDetTb, "erp_det_tb", "鎺ユ敹ERP涓嬪彂璁㈠崟鎺ユ敹鎴愬姛锛侊紒", true); + callApiLogSave(erpDetTb, "ERP_DETTB", "鎺ユ敹ERP涓嬪彂璁㈠崟鎺ユ敹鎴愬姛锛侊紒", true); } else { - erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='娣诲姞璁㈠崟鏄庣粏妗eけ璐ワ紒锛侊紒'" + "where 1=1 and prd_no=" + "'" + erpDetTb.getPrdNo() + "'"); - callApiLogSave(erpDetTb, "erp_det_tb", "ERP涓嬪彂璁㈠崟鎺ユ敹澶辫触锛侊紒", false); + erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='娣诲姞璁㈠崟鏄庣粏妗eけ璐ワ紒锛侊紒'" + "where 1=1 and PRD_NO=" + "'" + erpDetTb.getPrdNo() + "'"); + callApiLogSave(erpDetTb, "ERP_DETTB", "ERP涓嬪彂璁㈠崟鎺ユ敹澶辫触锛侊紒", false); } } } @@ -158,44 +159,45 @@ } else if (status == 1) { String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now); HashMap<String, Object> condition = new HashMap<>(); - condition.put("bill_no", "'" + erpDetTb.getBillNo() + "'"); - condition.put("prd_no", "'" + erpDetTb.getPrdNo() + "'"); - condition.put("iokindid", "'" + erpDetTb.getIokindid() + "'"); - condition.put("add_id", "'" + erpDetTb.getAddId() + "'"); - condition.put("qty", "'" + erpDetTb.getQty() + "'"); - condition.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'"); - condition.put("wh", "'" + erpDetTb.getWh() + "'"); - condition.put("billdate", "'" + format + "'"); - condition.put("status", "'" + erpDetTb.getStatus() + "'"); - condition.put("temp1", "'" + erpDetTb.getTemp1() + "'"); - condition.put("temp2", "'" + erpDetTb.getTemp2() + "'"); - condition.put("temp3", "'" + erpDetTb.getTemp3() + "'"); + condition.put("BIL_NO", "'" + erpDetTb.getBillNo() + "'"); + condition.put("PRD_NO", "'" + erpDetTb.getPrdNo() + "'"); + condition.put("ITM", "'" + erpDetTb.getItm() + "'"); + condition.put("ADD_ID", "'" + erpDetTb.getAddId2() + "'"); + condition.put("QTY", "'" + erpDetTb.getQty() + "'"); + condition.put("PRD_MARK", "'" + erpDetTb.getPrdMark() + "'"); + condition.put("WH", "'" + erpDetTb.getWh() + "'"); + condition.put("BIL_DATE", "'" + format + "'"); + condition.put("STATUS", "'" + erpDetTb.getStatus() + "'"); + condition.put("Temp1", "'" + erpDetTb.getTemp1() + "'"); + condition.put("Temp2", "'" + erpDetTb.getTemp2() + "'"); + condition.put("Temp3", "'" + erpDetTb.getTemp3() + "'"); erpSqlServer.insert(ErpDetTbBak.class, condition); - callApiLogSave(erpDetTb, "erp_det_tb_bak", "ERP涓嬪彂璁㈠崟澶囦唤鎴愬姛锛侊紒", true); +// callApiLogSave(erpDetTb, "ERP_DETTB_BAK", "ERP涓嬪彂璁㈠崟澶囦唤鎴愬姛锛侊紒", true); HashMap<String, String> condition2 = new HashMap<>(); - condition2.put("bill_no", "'" + erpDetTb.getBillNo() + "'"); - condition2.put("prd_no", "'" + erpDetTb.getPrdNo() + "'"); - condition2.put("prd_mark", "'" + erpDetTb.getPrdMark() + "'"); + condition2.put("BIL_NO", "'" + erpDetTb.getBillNo() + "'"); + condition2.put("PRD_NO", "'" + erpDetTb.getPrdNo() + "'"); + condition2.put("ITM", "'" + erpDetTb.getItm() + "'"); +// condition2.put("PRD_MARK", "'" + erpDetTb.getPrdMark() + "'"); erpSqlServer.delete(ErpDetTb.class, condition2); - callApiLogSave(erpDetTb, "erp_det_tb", "ERP涓嬪彂璁㈠崟澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛�", true); +// callApiLogSave(erpDetTb, "ERP_DETTB", "ERP涓嬪彂璁㈠崟澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛�", true); } else { - callApiLogSave(erpDetTb, "erp_det_tb", "鎺ユ敹ERP涓嬪彂璁㈠崟澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false); + callApiLogSave(erpDetTb, "ERP_DETTB", "鎺ユ敹ERP涓嬪彂璁㈠崟澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false); } } } } catch (Exception e) { Date date = new Date(); - log.error(date + ": 琛ㄥ悕锛歟rp_det_tb :" + e); + log.error(date + ": 琛ㄥ悕锛欵RP_DETTB :" + e); } } 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(), + apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", tableName, "null", ip, + "璁㈠崟鍙凤細" + erpDetTb.getBillNo() + "銆佸搧鍙凤細" + erpDetTb.getPrdNo() + "銆佽揣鍝佺壒寰侊細" + erpDetTb.getPrdMark() + "銆佺姸鎬侊細" + erpDetTb.getStatus$(), response, bool); } } -- Gitblit v1.9.1