From 3b037b2a09741d967d9ba52ed7b63b53d84fe456 Mon Sep 17 00:00:00 2001 From: 18516761980 <tqsxp@163.com> Date: 星期五, 03 二月 2023 16:39:30 +0800 Subject: [PATCH] # --- src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java | 67 ++++++++-------- src/main/java/com/zy/ints/task/scheduler/ErpPrdtSchedulerNew.java | 2 src/main/java/com/zy/ints/entity/ErpDetTb.java | 50 ++++++++++-- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 32 ++++---- src/main/java/com/zy/ints/entity/ErpDetTbBak.java | 50 ++++++++++-- src/main/resources/application.yml | 1 src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java | 2 7 files changed, 138 insertions(+), 66 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 173bc58..d71d3e4 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -70,28 +70,28 @@ 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)) { - if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { - exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); - } - } +// if (!Cools.isEmpty(wrkDetls)) { +// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { +// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); +// } +// } } // 鍑哄簱 -------------------------------------------------------------------------------- } else if (wrkMast.getWrkSts() == 15) { - if (!Cools.isEmpty(wrkDetls)) { - if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { - exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); - } - } +// if (!Cools.isEmpty(wrkDetls)) { +// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) { +// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo()); +// } +// } } // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗� diff --git a/src/main/java/com/zy/ints/entity/ErpDetTb.java b/src/main/java/com/zy/ints/entity/ErpDetTb.java index f7997d6..c8baf23 100644 --- a/src/main/java/com/zy/ints/entity/ErpDetTb.java +++ b/src/main/java/com/zy/ints/entity/ErpDetTb.java @@ -14,17 +14,17 @@ import java.util.Date; @Data -@TableName("erp_det_tb") +@TableName("ERP_DETTB") public class ErpDetTb implements Serializable { private static final long serialVersionUID = 1L; /** - * 鍗曟嵁鍙风爜 + * 鍗曟嵁鍙风爜 涓婚敭 */ @ApiModelProperty(value = "鍗曟嵁鍙风爜") - @TableId(value = "bill_no", type = IdType.INPUT) - @TableField("bill_no") + @TableId(value = "BIL_NO", type = IdType.INPUT) + @TableField("BIL_NO") private String billNo; /** @@ -32,7 +32,7 @@ */ @ApiModelProperty(value = "鍝佸彿") @TableId(value = "prd_no", type = IdType.INPUT) - @TableField("prd_no") + @TableField("PRD_NO") private String prdNo; /** @@ -51,13 +51,17 @@ * 澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級 */ @ApiModelProperty(value = "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級") - @TableField("add_id") private String addId; + + @ApiModelProperty(value = "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級") + @TableField("ADD_ID") + private int addId2; /** * 鏁伴噺 */ @ApiModelProperty(value = "鏁伴噺") + @TableField("QTY") private Double qty; /** @@ -65,13 +69,14 @@ */ @ApiModelProperty(value = "璐у搧鐗瑰緛") @TableId(value = "prd_mark", type = IdType.INPUT) - @TableField("prd_mark") + @TableField("PRD_MARK") private String prdMark; /** * 浠撳簱 */ @ApiModelProperty(value = "浠撳簱") + @TableField("WH") private String wh; /** @@ -79,39 +84,53 @@ */ @ApiModelProperty(value = "鏃ユ湡") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("BIL_DATE") private Date billdate; /** * 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級 */ @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級") + @TableField("STATUS") private Integer status; + + /** + * 琛屽彿 涓婚敭 + */ + @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級") + @TableField("ITM") + private Integer itm; /** * 澶囩敤瀛楁1 */ @ApiModelProperty(value = "澶囩敤瀛楁1") + @TableField("Temp1") private String temp1; /** * 澶囩敤瀛楁2 */ @ApiModelProperty(value = "澶囩敤瀛楁2") + @TableField("Temp2") private String temp2; /** * 澶囩敤瀛楁3 */ @ApiModelProperty(value = "澶囩敤瀛楁3") + @TableField("Temp3") private String temp3; public ErpDetTb() { } - public ErpDetTb(String billNo, String prdNo, String iokindid, String addId, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) { + public ErpDetTb(String billNo, String prdNo, String iokindid, int itm, int addId2, String addId, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) { this.billNo = billNo; this.prdNo = prdNo; this.iokindid = iokindid; + this.itm = itm; + this.addId2 = addId2; this.addId = addId; this.qty = qty; this.prdMark = prdMark; @@ -123,6 +142,21 @@ this.temp3 = temp3; } + public ErpDetTb(String billNo, String prdNo, int itm, int addId2, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) { + this.billNo = billNo; + this.prdNo = prdNo; + this.itm = itm; + this.addId2 = addId2; + this.qty = qty; + this.prdMark = prdMark; + this.wh = wh; + this.billdate = billdate; + this.status = status; + this.temp1 = temp1; + this.temp2 = temp2; + this.temp3 = temp3; + } + // DetTb detTb = new DetTb( // null, // id[闈炵┖] // null, // 鍗曟嵁鍙风爜[闈炵┖] diff --git a/src/main/java/com/zy/ints/entity/ErpDetTbBak.java b/src/main/java/com/zy/ints/entity/ErpDetTbBak.java index 8838afc..77c9f87 100644 --- a/src/main/java/com/zy/ints/entity/ErpDetTbBak.java +++ b/src/main/java/com/zy/ints/entity/ErpDetTbBak.java @@ -14,17 +14,17 @@ import java.util.Date; @Data -@TableName("erp_det_tb_bak") +@TableName("ERP_DETTB_BAK") public class ErpDetTbBak implements Serializable { private static final long serialVersionUID = 1L; /** - * 鍗曟嵁鍙风爜 + * 鍗曟嵁鍙风爜 涓婚敭 */ @ApiModelProperty(value = "鍗曟嵁鍙风爜") - @TableId(value = "bill_no", type = IdType.INPUT) - @TableField("bill_no") + @TableId(value = "BIL_NO", type = IdType.INPUT) + @TableField("BIL_NO") private String billNo; /** @@ -32,7 +32,7 @@ */ @ApiModelProperty(value = "鍝佸彿") @TableId(value = "prd_no", type = IdType.INPUT) - @TableField("prd_no") + @TableField("PRD_NO") private String prdNo; /** @@ -51,13 +51,17 @@ * 澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級 */ @ApiModelProperty(value = "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級") - @TableField("add_id") private String addId; + + @ApiModelProperty(value = "澧炲噺绗﹀彿:1锛堝姞锛屽叆搴擄級銆�2锛堝噺锛屽嚭搴擄級") + @TableField("ADD_ID") + private int addId2; /** * 鏁伴噺 */ @ApiModelProperty(value = "鏁伴噺") + @TableField("QTY") private Double qty; /** @@ -65,13 +69,14 @@ */ @ApiModelProperty(value = "璐у搧鐗瑰緛") @TableId(value = "prd_mark", type = IdType.INPUT) - @TableField("prd_mark") + @TableField("PRD_MARK") private String prdMark; /** * 浠撳簱 */ @ApiModelProperty(value = "浠撳簱") + @TableField("WH") private String wh; /** @@ -79,39 +84,53 @@ */ @ApiModelProperty(value = "鏃ユ湡") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField("BIL_DATE") private Date billdate; /** * 鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級 */ @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級") + @TableField("STATUS") private Integer status; + + /** + * 琛屽彿 涓婚敭 + */ + @ApiModelProperty(value = "鐘舵��:0锛堝垵濮嬬姸鎬侊級銆�1锛堝凡鎺ユ敹锛夈��2锛堝紓甯革級") + @TableField("ITM") + private Integer itm; /** * 澶囩敤瀛楁1 */ @ApiModelProperty(value = "澶囩敤瀛楁1") + @TableField("Temp1") private String temp1; /** * 澶囩敤瀛楁2 */ @ApiModelProperty(value = "澶囩敤瀛楁2") + @TableField("Temp2") private String temp2; /** * 澶囩敤瀛楁3 */ @ApiModelProperty(value = "澶囩敤瀛楁3") + @TableField("Temp3") private String temp3; public ErpDetTbBak() { } - public ErpDetTbBak(String billNo, String prdNo, String iokindid, String addId, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) { + public ErpDetTbBak(String billNo, String prdNo, String iokindid, int itm, int addId2, String addId, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) { this.billNo = billNo; this.prdNo = prdNo; this.iokindid = iokindid; + this.itm = itm; + this.addId2 = addId2; this.addId = addId; this.qty = qty; this.prdMark = prdMark; @@ -123,6 +142,21 @@ this.temp3 = temp3; } + public ErpDetTbBak(String billNo, String prdNo, int itm, int addId2, Double qty, String prdMark, String wh, Date billdate, Integer status, String temp1, String temp2, String temp3) { + this.billNo = billNo; + this.prdNo = prdNo; + this.itm = itm; + this.addId2 = addId2; + this.qty = qty; + this.prdMark = prdMark; + this.wh = wh; + this.billdate = billdate; + this.status = status; + this.temp1 = temp1; + this.temp2 = temp2; + this.temp3 = temp3; + } + // DetTb detTb = new DetTb( // null, // id[闈炵┖] // null, // 鍗曟嵁鍙风爜[闈炵┖] 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 79f1b65..0b0c5f8 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpDetTbScheduler.java @@ -34,6 +34,8 @@ */ @Value("${erp.enabled}") private Boolean erpEnabled; + @Value("${erp.enabledErpDetTb}") + private Boolean erpEnabledErpDetTb; @Value("${erp.useName.ip}") private String ip; @Autowired @@ -56,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); @@ -70,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)) { @@ -111,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.getAddId().equals("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); } } } @@ -146,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); } } } @@ -157,38 +159,39 @@ } 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); } } 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 273f38a..76402f3 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtScheduler.java @@ -44,7 +44,7 @@ private MatService matService; /** - * 鑾峰彇鍟嗗搧淇℃伅琛ㄨ祫鏂� 骞村墠 + * 鑾峰彇鍟嗗搧淇℃伅琛ㄨ祫鏂� */ @Scheduled(cron = "${erp.refreshtime}") public void obtainPedt() { diff --git a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtSchedulerNew.java b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtSchedulerNew.java index 1cab6f2..a35671f 100644 --- a/src/main/java/com/zy/ints/task/scheduler/ErpPrdtSchedulerNew.java +++ b/src/main/java/com/zy/ints/task/scheduler/ErpPrdtSchedulerNew.java @@ -46,7 +46,7 @@ private MatService matService; /** - * 鑾峰彇鍟嗗搧淇℃伅琛ㄨ祫鏂� + * 鑾峰彇鍟嗗搧淇℃伅琛ㄨ祫鏂� 骞村墠 */ @Scheduled(cron = "${erp.refreshtime}") public void obtainPedt() { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 041593b..6fbb844 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -53,6 +53,7 @@ erp: enabled: false enabledNew: false + enabledErpDetTb: false # enabled: false #鏌ョ湅ERP涓棿琛ㄩ棿闅� refreshtime: 0/5 * * * * ? -- Gitblit v1.9.1