| src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/service/erp/ErpSqlServer.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -82,8 +82,8 @@ waitPakin.setModiUser(userId); waitPakin.setModiTime(new Date()); VersionUtils.setWaitPakIn(waitPakin, matCode); waitPakin.setMatnr(matCode.getMatNo()+"|"+combMat.getMnemonic()); //产品编码|生产单号 waitPakin.setBname(matCode.getMatNo()); // waitPakin.setMatnr(matCode.getMatNo()+"|"+combMat.getMnemonic()); //产品编码|生产单号 // waitPakin.setBname(matCode.getMatNo()); // 如果生成单号不为空插入生产单号 if (!Cools.isEmpty(combMat.getMnemonic())) { waitPakin.setMnemonic(combMat.getMnemonic()); src/main/java/com/zy/common/service/erp/ErpSqlServer.java
@@ -25,7 +25,7 @@ public class ErpSqlServer { // 数据库连接 private Connection conn; // private Connection conn; // 创建预编译语句对象，一般都是用这个而不用Statement private PreparedStatement pstm = null; // 创建一个结果集对象 @@ -69,8 +69,9 @@ private List<Map<String, Object>> executeQuery(String sql) { Connection conn = null; try { Connection conn = getConn(); conn = getConn(); pstm = conn.prepareStatement(sql); rs = pstm.executeQuery(); // List<Map<String, Object>> maps = convertList(rs); @@ -80,13 +81,28 @@ return null; } finally { release(); if (conn != null) { try { conn.close(); conn = null; } catch (SQLException e) { e.printStackTrace(); } } } } private int executeUpdate(String sql) { Connection conn = null; try { Connection conn = getConn(); pstm = conn.prepareStatement(sql); conn = getConn(); if(null != conn) { pstm = conn.prepareStatement(sql); } else { log.error("更新ERP中间表失败===>>数据库连接conn为空"); log.error("更新ERP中间表失败===>>" + sql); } return pstm.executeUpdate(); } catch (Exception e) { e.printStackTrace(); @@ -95,6 +111,14 @@ return 0; } finally { release(); if (conn != null) { try { conn.close(); conn = null; } catch (SQLException e) { e.printStackTrace(); } } } } @@ -112,18 +136,29 @@ return list; } public synchronized Connection getConn() throws SQLException { if (null == this.conn || this.conn.isClosed()) { try { Class.forName(erpDbProperties.getDriver_class_name()).newInstance(); this.conn = DriverManager.getConnection(erpDbProperties.getUr(), erpDbProperties.getUsername(), erpDbProperties.getPassword()); } catch (Exception e) { log.error("获取ERP数据库连接失败"); e.printStackTrace(); throw new RuntimeException("获取ERP数据库连接失败"); } //synchronized public Connection getConn() throws SQLException { Connection conn = null; try { Class.forName(erpDbProperties.getDriver_class_name()).newInstance(); conn = DriverManager.getConnection(erpDbProperties.getUr(), erpDbProperties.getUsername(), erpDbProperties.getPassword()); } catch (Exception e) { log.error("获取ERP数据库连接失败"); e.printStackTrace(); throw new RuntimeException("获取ERP数据库连接失败"); } return this.conn; return conn; // if (null == this.conn || this.conn.isClosed()) { // try { // Class.forName(erpDbProperties.getDriver_class_name()).newInstance(); // this.conn = DriverManager.getConnection(erpDbProperties.getUr(), erpDbProperties.getUsername(), erpDbProperties.getPassword()); // } catch (Exception e) { // log.error("获取ERP数据库连接失败"); // e.printStackTrace(); // throw new RuntimeException("获取ERP数据库连接失败"); // } // } // return this.conn; } private void release() { @@ -141,14 +176,14 @@ e.printStackTrace(); } } if (conn != null) { try { conn.close(); conn = null; } catch (SQLException e) { e.printStackTrace(); } } // if (conn != null) { // try { // conn.close(); // conn = null; // } catch (SQLException e) { // e.printStackTrace(); // } // } } /** src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -70,9 +70,9 @@ VersionUtils.setWaitPakIn(waitPakin, matCode); waitPakin.setMnemonic(entry.getFOrderBillNo()); // todo:luxiaotao 生产单号 waitPakin.setSupplier(dto.getInStockBill().getFBillNo()); // todo:luxiaotao 通知单号 String Fnumber = (Cools.isEmpty(entry.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + entry.getFSourceBillNo(); waitPakin.setMatnr(Fnumber); //产品代码|生产单号 waitPakin.setBname(matCode.getMatNo()); // String Fnumber = (Cools.isEmpty(entry.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + entry.getFSourceBillNo(); // waitPakin.setMatnr(Fnumber); //产品代码|生产单号 // waitPakin.setBname(matCode.getMatNo()); Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>() .eq("supplier", waitPakin.getSupplier()) .eq("matnr", waitPakin.getMatnr()); @@ -128,9 +128,9 @@ VersionUtils.setWaitPakIn(waitPakin, matCode); waitPakin.setMnemonic(cpicmo.getFSourceBillNo()); // todo:luxiaotao 生产单号 waitPakin.setSupplier(cpicmo.getFBillNo()); // todo:luxiaotao 通知单号 String Fnumber = (Cools.isEmpty(cpicmo.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + cpicmo.getFSourceBillNo(); waitPakin.setMatnr(Fnumber); //产品代码|生产单号 waitPakin.setBname(matCode.getMatNo()); // String Fnumber = (Cools.isEmpty(cpicmo.getFSourceBillNo())) ? matCode.getMatNo() : matCode.getMatNo() + "|" + cpicmo.getFSourceBillNo(); // waitPakin.setMatnr(Fnumber); //产品代码|生产单号 // waitPakin.setBname(matCode.getMatNo()); Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>() .eq("supplier", waitPakin.getSupplier()) .eq("matnr", waitPakin.getMatnr()); @@ -212,8 +212,8 @@ eq("FEntryID", outStockBillEntry.getFEntryID()).eq("FBrNo",outStockBillEntry.getFBrNo()); OutStockBillEntry one = outStockService.selectOne(wrapper); if (null == one) { String Fnumber = (Cools.isEmpty(outStockBillEntry.getFSourceBillNo())) ? outStockBillEntry.getFnumber() : outStockBillEntry.getFnumber()+"|"+outStockBillEntry.getFSourceBillNo(); outStockBillEntry.setFnumber(Fnumber); //产品代码|生产单号 // String Fnumber = (Cools.isEmpty(outStockBillEntry.getFSourceBillNo())) ? outStockBillEntry.getFnumber() : outStockBillEntry.getFnumber()+"|"+outStockBillEntry.getFSourceBillNo(); // outStockBillEntry.setFnumber(Fnumber); //产品代码|生产单号 if (!outStockService.insert(outStockBillEntry)) { log.info("提取出库通知明细表OutStockBillEntry失败[FBrNo={},FInterID={},FEntryID={}]",outStockBillEntry.getFBrNo(), outStockBillEntry.getFInterID(),outStockBillEntry.getFEntryID());
