From 8b470245dae34e0fa6e558a895865503ba6d99f4 Mon Sep 17 00:00:00 2001 From: LSH Date: 星期三, 04 一月 2023 13:52:27 +0800 Subject: [PATCH] #中间表对接:优化,添加记录 --- src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 34 ++++++++--- src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java | 92 +++++++++++++++++++++--------- src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java | 2 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 12 ++-- src/main/resources/application.yml | 2 src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 31 ++++++++-- 6 files changed, 123 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java index 6a86f6f..173bc58 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -70,12 +70,12 @@ exceptionHandle("鍒犻櫎鍏ュ簱閫氱煡妗workNo={0}]澶辫触", wrkMast.getWrkNo()); } } -// // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆� -// if (!Cools.isEmpty(wrkDetls)) { -// if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) { -// exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); -// } -// } + // 鎵嬪姩鍏ュ簱鐢熸垚鍗曟嵁 銆� 涓婃姤涓夋柟骞冲彴 銆� + if (!Cools.isEmpty(wrkDetls)) { + if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) { + exceptionHandle("鐢熸垚鎵嬪姩鍏ュ簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); + } + } // 鎷f枡鍐嶅叆搴� } else if (wrkMast.getIoType() == 53) { if (!Cools.isEmpty(wrkDetls)) { 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 8cb6b98..793ef31 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java @@ -8,10 +8,7 @@ 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.asrs.service.*; import com.zy.ints.entity.ErpDetTb; import com.zy.ints.entity.ErpDetTbBak; import com.zy.ints.erp.ErpSqlServer; @@ -38,6 +35,8 @@ */ @Value("${erp.enabled}") private Boolean erpEnabled; + @Value("${erp.useName.ip}") + private String ip; @Autowired private ErpSqlServer erpSqlServer; @Autowired @@ -50,6 +49,8 @@ private SnowflakeIdWorker snowflakeIdWorker; @Autowired private DocTypeService docTypeService; + @Autowired + private ApiLogService apiLogService; /** * 鑾峰彇鍏ュ嚭搴撹鍗曚俊鎭� @@ -71,6 +72,7 @@ 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); } else { Order order = orderService.selectByNo(erpDetTb.getBillNo()); if (Cools.isEmpty(order)) { @@ -115,7 +117,10 @@ if (!Cools.isEmpty(docType)) { order.setDocType(docType.getDocId()); if (!orderService.insert(order)) { - throw new CoolException("娣诲姞璁㈠崟涓绘。淇℃伅澶辫触锛侊紒锛�"); + callApiLogSave(erpDetTb, "erp_det_tb", "璁㈠崟涓绘。娣诲姞澶辫触锛侊紒", false); + continue; + } else { + callApiLogSave(erpDetTb, "erp_det_tb", "璁㈠崟涓绘。娣诲姞鎴愬姛锛侊紒", true); } } } @@ -140,10 +145,12 @@ orderDetl.setUpdateBy(9999L); orderDetl.setUpdateTime(now); orderDetl.setMemo(erpDetTb.getWh()); - if (orderDetlService.insert(orderDetl)){ + if (orderDetlService.insert(orderDetl)) { erpSqlServer.update(sqlUpDateErpDetTbOne + "'" + erpDetTb.getPrdNo() + "'"); - }else { + callApiLogSave(erpDetTb, "erp_det_tb", "鎺ユ敹ERP涓嬪彂璁㈠崟鎺ユ敹鎴愬姛锛侊紒", true); + } else { erpSqlServer.update(sqlUpDateErpDetTbTwo + ",temp1='娣诲姞璁㈠崟鏄庣粏妗eけ璐ワ紒锛侊紒'" + "where 1=1 and prd_no=" + "'" + erpDetTb.getPrdNo() + "'"); + callApiLogSave(erpDetTb, "erp_det_tb", "鎺ユ敹ERP涓嬪彂璁㈠崟鎺ユ敹澶辫触锛侊紒", false); } } } @@ -165,15 +172,18 @@ condition.put("temp3", "'" + erpDetTb.getTemp3() + "'"); erpSqlServer.insert(ErpDetTbBak.class, condition); + callApiLogSave(erpDetTb, "erp_det_tb_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() + "'"); erpSqlServer.delete(ErpDetTb.class, condition2); - } else if (status == 2) { + + callApiLogSave(erpDetTb, "erp_det_tb", "erp涓嬪彂璁㈠崟澶囦唤鍚庡垹闄ゆ垚鍔燂紒锛�", true); } else { - + callApiLogSave(erpDetTb, "erp_det_tb", "鎺ユ敹ERP涓嬪彂璁㈠崟澶辫触锛侊紒锛佺姸鎬佸紓甯革紒锛侊紒", false); } } } @@ -182,4 +192,10 @@ log.error(date + ": 琛ㄥ悕锛歟rp_det_tb :" + 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(), + 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 2f53d22..4264d62 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpLkScheduler.java @@ -28,7 +28,7 @@ * ERP涓巐k搴撳瓨鏁版嵁姣斿 */ @Scheduled(cron = "${erp.refreshtime}") - public void InOrOutOrder() { + 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 sqlUpDateErpLkOne = "update bas_erp_lk set status=1 where prd_no="; 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 3f3b7d3..66179df 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java @@ -3,8 +3,10 @@ import com.core.common.Cools; import com.zy.asrs.entity.Mat; import com.zy.asrs.entity.Tag; +import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.MatService; import com.zy.asrs.service.TagService; +import com.zy.ints.entity.ErpDetTb; import com.zy.ints.entity.Prdt; import com.zy.ints.entity.PrdtBak; import com.zy.ints.erp.ErpSqlServer; @@ -31,6 +33,10 @@ */ @Value("${erp.enabled}") private Boolean erpEnabled; + @Value("${erp.useName.ip}") + private String ip; + @Autowired + private ApiLogService apiLogService; @Autowired private TagService tagService; @Autowired @@ -71,8 +77,10 @@ matNew.setUpdateTime(date); if (matService.insert(matNew)) { erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'"); + callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佹坊鍔犲晢鍝佷俊鎭垚鍔燂紒", true); } else { erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'"); + callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佹坊鍔犲晢鍝佷俊鎭け璐ワ紒锛侊紒", false); } } } else if (type == 2) { @@ -83,8 +91,10 @@ mat.setSpecs(prdt.getSpc()); if (matService.updateById(mat)) { erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'"); + callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佷慨鏀瑰晢鍝佷俊鎭垚鍔燂紒", true); } else { erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'"); + callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅澶辫触锛侊紒锛佷慨鏀瑰晢鍝佷俊鎭け璐ワ紒锛侊紒", false); } } } else if (type == 3) { @@ -92,12 +102,14 @@ if (!Cools.isEmpty(mat)) { if (matService.deleteById(mat.getId())) { erpSqlServer.update(sqlUpDatePrdtOne + "'" + prdt.getPrdNo() + "'"); + callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭垚鍔燂紒", true); } else { erpSqlServer.update(sqlUpDatePrdtTwo + "'" + prdt.getPrdNo() + "'"); + callApiLogSave(prdt, "erp_prdt", "鎺ユ敹ERP涓嬪彂鍟嗗搧淇℃伅鎴愬姛锛佸垹闄ゅ晢鍝佷俊鎭け璐ワ紒", false); } } } else { - + callApiLogSave(prdt, "erp_prdt", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡锛�", false); } } else if (prdt.getStatus() == 1) { HashMap<String, Object> condition = new HashMap<>(); @@ -108,21 +120,26 @@ condition.put("type", "'" + prdt.getType() + "'"); condition.put("status", "'" + prdt.getStatus() + "'"); erpSqlServer.insert(PrdtBak.class, condition); + callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鎴愬姛锛�", true); HashMap<String, String> condition2 = new HashMap<>(); condition2.put("prd_no", "'" + prdt.getPrdNo() + "'"); erpSqlServer.delete(Prdt.class, condition2); - } else if (prdt.getStatus() == 2) { - - } else { - + callApiLogSave(prdt, "erp_prdt_bak", "ERP涓嬪彂鍟嗗搧淇℃伅澶囦唤鍚庡垹闄ゆ垚鍔燂紒", true); + } else{ + callApiLogSave(prdt, "erp_prdt", "鍟嗗搧淇℃伅鍑虹幇寮傚父璧勬枡锛�", false); } - } } } catch (Exception e) { - + Date date = new Date(); + log.error(date + ": 琛ㄥ悕锛歟rp_prdt :" + e); } + } + 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(), + 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 282b5ac..08b8217 100644 --- a/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/LkDetTbScheduler.java @@ -6,9 +6,11 @@ import com.zy.asrs.entity.DocType; import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; +import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.DocTypeService; import com.zy.asrs.service.OrderDetlService; import com.zy.asrs.service.OrderService; +import com.zy.ints.entity.ErpDetTb; import com.zy.ints.entity.ErpDetTbBak; import com.zy.ints.entity.LkDetTb; import com.zy.ints.entity.LkDetTbBak; @@ -36,6 +38,10 @@ */ @Value("${erp.enabled}") private Boolean erpEnabled; + @Value("${erp.useName.ip}") + private String ip; + @Autowired + private ApiLogService apiLogService; @Autowired private ErpSqlServer erpSqlServer; @Autowired @@ -44,51 +50,54 @@ private OrderDetlService orderDetlService; @Autowired private DocTypeService docTypeService; + /** * 涓婃姤鍏ュ嚭搴撳畬缁撹鍗曚俊鎭� */ @Scheduled(cron = "${erp.refreshtime}") - public void InOrOutOrder() { + public void reportOrder() { if (!erpEnabled) return; String sqlSelectLkDetTb = "select bill_no as billNo,prd_no as prdNo,iokindid,add_id as addId,qty,prd_mark as prdMark,wh,billdate,status,temp1,temp2,temp3 from lk_det_tb where 1=1"; String sqlSelectLkDetTbBak = "select bill_no as billNo,prd_no as prdNo,iokindid,add_id as addId,qty,prd_mark as prdMark,wh,billdate,status,temp1,temp2,temp3 from lk_det_tb_bak where 1=1"; try { List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L)); - if (orders.size()>0){ - for (Order order:orders){ + if (orders.size() > 0) { + for (Order order : orders) { List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId()); - if (!Cools.isEmpty(orderDetls)){ - for (OrderDetl orderDetl:orderDetls){ + if (!Cools.isEmpty(orderDetls)) { + for (OrderDetl orderDetl : orderDetls) { Date now = new Date(); - List<LkDetTb> lkDetTbs = erpSqlServer.select(sqlSelectLkDetTb+ - " and bill_no='"+orderDetl.getOrderNo()+"'" + - " and prd_no='"+orderDetl.getMatnr()+"'" + - " and prd_mark='"+orderDetl.getBatch()+"'" + List<LkDetTb> lkDetTbs = erpSqlServer.select(sqlSelectLkDetTb + + " and bill_no='" + orderDetl.getOrderNo() + "'" + + " and prd_no='" + orderDetl.getMatnr() + "'" + + " and prd_mark='" + orderDetl.getBatch() + "'" , LkDetTb.class); - List<LkDetTbBak> lkDetTbBaks = erpSqlServer.select(sqlSelectLkDetTbBak+ - " and bill_no='"+orderDetl.getOrderNo()+"'" + - " and prd_no='"+orderDetl.getMatnr()+"'" + - " and prd_mark='"+orderDetl.getBatch()+"'" + List<LkDetTbBak> lkDetTbBaks = erpSqlServer.select(sqlSelectLkDetTbBak + + " and bill_no='" + orderDetl.getOrderNo() + "'" + + " and prd_no='" + orderDetl.getMatnr() + "'" + + " and prd_mark='" + orderDetl.getBatch() + "'" , LkDetTbBak.class); - if (lkDetTbs.size() == 1 || lkDetTbBaks.size()==1){ - log.error("璁㈠崟鍙凤細"+orderDetl.getOrderNo()+"銆佸晢鍝佺紪鍙凤細"+orderDetl.getMatnr()+"銆佽揣鍝佺壒寰侊細"+orderDetl.getBatch()+" " + - "宸茬粡涓婃姤浣嗘槸鏄庣粏渚濇棫瀛樺湪锛岃鑱旂郴寮�鍙戜汉鍛橈紒锛侊紒"); + if (lkDetTbs.size() == 1) { + callApiLogSaveLkDetTb(lkDetTbs.get(0), "erp_det_tb", "宸茬粡涓婃姤浣嗘槸鏄庣粏渚濇棫瀛樺湪锛岃鑱旂郴寮�鍙戜汉鍛橈紒锛侊紒", false); continue; - }else if (lkDetTbs.size()>1 || lkDetTbBaks.size()>1){ - log.error("鐩稿悓 璁㈠崟鍙凤細"+orderDetl.getOrderNo()+"銆佸晢鍝佺紪鍙凤細"+orderDetl.getMatnr()+"銆佽揣鍝佺壒寰侊細"+orderDetl.getBatch()+" " + - "瀛樺湪閲嶅璧勬枡锛岃仈绯诲紑鍙戜汉鍛橈紒锛侊紒"); + } else if (lkDetTbBaks.size() == 1) { + callApiLogSaveLkDetTbBak(lkDetTbBaks.get(0), "erp_det_tb_bak", "宸茬粡涓婃姤浣嗘槸鏄庣粏渚濇棫瀛樺湪锛岃鑱旂郴寮�鍙戜汉鍛橈紒锛侊紒", false); continue; -// throw new CoolException("鐩稿悓 璁㈠崟鍙凤細"+orderDetl.getOrderNo()+"銆佸晢鍝佺紪鍙凤細"+orderDetl.getMatnr()+"銆佽揣鍝佺壒寰侊細"+orderDetl.getBatch()+" " + -// "瀛樺湪閲嶅璧勬枡锛岃仈绯诲紑鍙戜汉鍛橈紒锛侊紒"); - }else { + } else if (lkDetTbs.size() > 1) { + callApiLogSaveLkDetTb(lkDetTbs.get(0), "erp_det_tb", "瀛樺湪閲嶅璧勬枡锛岃仈绯诲紑鍙戜汉鍛橈紒锛侊紒", false); + continue; + } else if (lkDetTbBaks.size() > 1) { + callApiLogSaveLkDetTbBak(lkDetTbBaks.get(0), "erp_det_tb_bak", "瀛樺湪閲嶅璧勬枡锛岃仈绯诲紑鍙戜汉鍛橈紒锛侊紒", false); + continue; + } else { String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(now); HashMap<String, Object> condition = new HashMap<>(); condition.put("bill_no", "'" + orderDetl.getOrderNo() + "'"); condition.put("prd_no", "'" + orderDetl.getMatnr() + "'"); DocType docType = docTypeService.selectById(order.getDocType()); - if (!Cools.isEmpty(docType)){ + if (!Cools.isEmpty(docType)) { int addid = docType.getPakin() == 1 ? 1 : 2; condition.put("iokindid", "'" + docType.getDocName$() + "'"); condition.put("add_id", "'" + addid + "'"); @@ -100,24 +109,53 @@ condition.put("billdate", "'" + format + "'"); condition.put("status", "'" + 0 + "'"); erpSqlServer.insert(LkDetTb.class, condition); + callApiLogSaveOrderDetl(orderDetl, "瀹岀粨璁㈠崟鏄庣粏涓婃姤瀹屾垚", true); } //淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗� - if (orderDetlService.addToLogTable(orderDetl)){ + if (orderDetlService.addToLogTable(orderDetl)) { + callApiLogSaveOrderDetl(orderDetl, "淇濆瓨璁㈠崟鏄庣粏鍘嗗彶妗f垚鍔燂紒", true); //鍒犻櫎璁㈠崟鏄庣粏 orderDetlService.deleteById(orderDetl.getId()); + callApiLogSaveOrderDetl(orderDetl, "璁㈠崟鏄庣粏妗d繚瀛樺悗鍒犻櫎鎴愬姛锛�", true); } } //淇濆瓨璁㈠崟鍘嗗彶妗� - if (orderService.addToLogTable(order)){ + if (orderService.addToLogTable(order)) { + callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗f垚鍔燂紒锛侊紒", true); //鍒犻櫎瀹岀粨璁㈠崟 orderService.deleteById(order.getId()); + callApiLogSaveOrder(order, "瀹岀粨璁㈠崟涓婃姤瀹屾垚锛屽苟淇濆瓨璁㈠崟鍘嗗彶妗e悗鍒犻櫎瀹岀粨璁㈠崟鎴愬姛锛侊紒锛�", true); } } } } - }catch (Exception e){ - + } catch (Exception e) { + Date date = new Date(); + log.error(date + ": 琛ㄥ悕锛歭k_det_tb :" + e); } } + + public void callApiLogSaveLkDetTb(LkDetTb lkDetTb, String tableName, String response, Boolean bool) { + apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", "涓棿琛細" + tableName, "null", ip, + "璁㈠崟鍙凤細" + lkDetTb.getBillNo() + "鍝佸彿锛�" + lkDetTb.getPrdNo() + "璐у搧鐗瑰緛锛�" + lkDetTb.getPrdMark() + "鐘舵�侊細" + lkDetTb.getStatus(), + response, bool); + } + + public void callApiLogSaveLkDetTbBak(LkDetTbBak lkDetTbBak, String tableName, String response, Boolean bool) { + apiLogService.save("ERP涓嬪彂璁㈠崟淇℃伅", "涓棿琛細" + tableName, "null", ip, + "璁㈠崟鍙凤細" + lkDetTbBak.getBillNo() + "鍝佸彿锛�" + lkDetTbBak.getPrdNo() + "璐у搧鐗瑰緛锛�" + lkDetTbBak.getPrdMark() + "鐘舵�侊細" + lkDetTbBak.getStatus(), + response, bool); + } + + public void callApiLogSaveOrderDetl(OrderDetl orderDetl, String response, Boolean bool) { + apiLogService.save("涓婃姤瀹岀粨璁㈠崟鏄庣粏淇℃伅", "涓棿琛細lk_det_tb", "null", ip, + "璁㈠崟鍙凤細" + orderDetl.getOrderNo() + "鍝佸彿锛�" + orderDetl.getMatnr() + "璐у搧鐗瑰緛锛�" + orderDetl.getBatch(), + response, bool); + } + + public void callApiLogSaveOrder(Order order, String response, Boolean bool) { + apiLogService.save("瀹岀粨璁㈠崟淇℃伅涓婃姤瀹屾垚", "涓棿琛細lk_det_tb", "null", ip, + "璁㈠崟鍙凤細" + order.getOrderNo(), response, bool); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 61d3643..03b0b8e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -60,6 +60,8 @@ url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrs username: sa password: sa@123 + useName: + ip: 127.0.0.1 comb: -- Gitblit v1.9.1