From 9052fef232f56eb878d7cf8360a09a11e6a0fe2f Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期五, 06 六月 2025 10:48:54 +0800 Subject: [PATCH] # --- src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) 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 873ca15..8802c0e 100644 --- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java +++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java @@ -37,29 +37,34 @@ //@Transactional(rollbackFor = Throwable.class) @Scheduled(cron = "${erp.refreshtime}") public void InHedTBScheduler() { - //log.info("InHedTBScheduler寮�濮嬩簡"); + //log.info("InHedTBScheduler寮�濮嬩簡" + // 7); if (!erpEnabled) return; - String sqlInHed = "select * from erp_InHedTB where LKName='涓壃浜屾湡'"; + String sqlInHed = "select * from erp_InHedTB where LKName='楂橀湒绔嬪簱'"; List<InHedTB> inHeds = erpSqlServer.select(sqlInHed, InHedTB.class); if (!inHeds.isEmpty()) { for (InHedTB inHed : inHeds) { if (!Cools.isEmpty(inHed.getTemp3()) && inHed.getTemp3().equals("fault")) { - continue; + //continue; } HashMap<String, String> condition = new HashMap<>(); - condition.put("BillNo", "'" + inHed.getBillNo() + "'"); + condition.put("bill_no", "'" + inHed.getBillNo() + "'"); List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition); HashMap<String, Object> hedAndDet = new HashMap<>(); hedAndDet.put("hed", inHed); hedAndDet.put("det", inDetTBS); + if (inDetTBS == null || inDetTBS.isEmpty()) { + continue; + } try { inMS.createInOrder(inHed, inDetTBS); log.info("鍏ュ簱鍗曟嵁鎴愬姛,{}", inHed); move(hedAndDet); } catch (Exception e) { - e.printStackTrace(); - String sql = "UPDATE erp_InHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'"; - erpSqlServer.update(sql); + log.info(e.getMessage()); + //e.printStackTrace(); + String sql = "UPDATE erp_InHedTB SET Temp3 = 'fault' WHERE bill_no = '" + inHed.getBillNo() + "'"; + erpSqlServer.update(sql); } } } @@ -71,12 +76,12 @@ InHedTB hed = (InHedTB) hedAndDet.get("hed"); ArrayList<InDetTB> dets = (ArrayList<InDetTB>) hedAndDet.get("det"); HashMap<String, String> condition = new HashMap<>(); - condition.put("BillNo", "'" + hed.getBillNo() + "'"); + condition.put("bill_no", "'" + hed.getBillNo() + "'"); erpSqlServer.delete(InHedTB.class, condition); for (InDetTB det : dets) { HashMap<String, String> condition2 = new HashMap<>(); - condition2.put("BillNo", "'" + det.getBillNo() + "'"); - condition2.put("iNo", String.valueOf(det.getINO())); + condition2.put("bill_no", "'" + det.getBillNo() + "'"); + condition2.put("i_no", String.valueOf(det.getINO())); erpSqlServer.delete(InDetTB.class, condition2); } -- Gitblit v1.9.1