From 3ff680c755e797879d0629efec67f109d233a857 Mon Sep 17 00:00:00 2001 From: lty <876263681@qq.com> Date: 星期三, 23 七月 2025 11:05:34 +0800 Subject: [PATCH] # --- src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 110 +++++++++++++++++++++++++++--------------------------- 1 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java index 77537aa..9b96131 100644 --- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java +++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java @@ -93,9 +93,9 @@ */ @Transactional(rollbackFor = Throwable.class) public boolean insertInDet(OrderDetl orderDetl) { - String sqlInDetTb = "select * from lk_InDetTB where bill_no='" + orderDetl.getOrderNo() + "' and " + " item_id='" + orderDetl.getMatnr() + "' and item_batch='" + orderDetl.getBatch() + "' and pro_type='" + orderDetl.getSpecs() + "'"; + String sqlInDetTb = "select * from Lk_InDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemID='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'"; List<InDetTB> inDets = erpSqlServer.select(sqlInDetTb, InDetTB.class); - String sqlInDetTbBak = "select * from lk_InDetTB_Bak where bill_no='" + orderDetl.getOrderNo() + "' and " + " item_id='" + orderDetl.getMatnr() + "' and item_batch='" + orderDetl.getBatch() + "' and pro_type='" + orderDetl.getSpecs() + "'"; + String sqlInDetTbBak = "select * from Lk_InDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemID='" + orderDetl.getMatnr() + "' and ItemBatch='" + orderDetl.getBatch() + "' and proType='" + orderDetl.getSpecs() + "'"; List<InDetTBBak> inDetBaks = erpSqlServer.select(sqlInDetTbBak, InDetTBBak.class); if (!inDets.isEmpty() || !inDetBaks.isEmpty()) { log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo()); @@ -122,9 +122,9 @@ */ @Transactional(rollbackFor = Throwable.class) public boolean insertInHed(Order order) { - String sqlInHedTb = "select * from lk_InHedTB where LKName='楂橀湒绔嬪簱' and bill_no='" + order.getOrderNo() + "'"; + String sqlInHedTb = "select * from lk_InHedTB where LKName='楂橀湒绔嬪簱' and BillNo='" + order.getOrderNo() + "'"; List<InHedTB> outHeds = erpSqlServer.select(sqlInHedTb, InHedTB.class); - String sqlInHedTbBak = "select * from lk_InHedTB_Bak where LKName='楂橀湒绔嬪簱' and bill_no='" + order.getOrderNo() + "'"; + String sqlInHedTbBak = "select * from lk_InHedTB_Bak where LKName='楂橀湒绔嬪簱' and BillNo='" + order.getOrderNo() + "'"; List<InHedTBBak> inHedBaks = erpSqlServer.select(sqlInHedTbBak, InHedTBBak.class); if (!outHeds.isEmpty() || !inHedBaks.isEmpty()) { log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo()); @@ -132,20 +132,20 @@ } DocType docType = docTypeService.selectById(order.getDocType()); HashMap<String, Object> content = new HashMap<>(); - content.put("bill_no", "'" + order.getOrderNo() + "'"); - content.put("bill_date", "'" + DateUtils.convert(new Date()) + "'"); - if (!Cools.isEmpty(docType.getDocCode())) content.put("io_kind_id", "'" + docType.getDocCode() + "'"); - if (!Cools.isEmpty(docType.getDocName())) content.put("io_kind_name", "'" + docType.getDocName() + "'"); - if (!Cools.isEmpty(order.getWareId())) content.put("ware_id", "'" + order.getWareId() + "'"); - if (!Cools.isEmpty(order.getWareName())) content.put("ware_name", "'" + order.getWareName() + "'"); - if (!Cools.isEmpty(order.getTemp1())) content.put("temp1", "'" + order.getTemp1() + "'"); - if (!Cools.isEmpty(order.getTemp2())) content.put("temp2", "'" + order.getTemp2() + "'"); - if (!Cools.isEmpty(order.getTemp3())) content.put("temp3", "'" + order.getTemp3() + "'"); - if (!Cools.isEmpty(order.getCstmr())) content.put("object_id", "'" + order.getCstmr() + "'"); - if (!Cools.isEmpty(order.getCstmrName())) content.put("object_name", "'" + order.getCstmrName() + "'"); - if (!Cools.isEmpty(order.getMemo())) content.put("remark", "'" + order.getMemo() + "'"); + content.put("BillNo", "'" + order.getOrderNo() + "'"); + content.put("BillDate", "'" + DateUtils.convert(new Date()) + "'"); + if (!Cools.isEmpty(docType.getDocCode())) content.put("IoKindId", "'" + docType.getDocCode() + "'"); + if (!Cools.isEmpty(docType.getDocName())) content.put("IoKindName", "'" + docType.getDocName() + "'"); + if (!Cools.isEmpty(order.getWareId())) content.put("WareId", "'" + order.getWareId() + "'"); + if (!Cools.isEmpty(order.getWareName())) content.put("WareName", "'" + order.getWareName() + "'"); + if (!Cools.isEmpty(order.getTemp1())) content.put("Temp1", "'" + order.getTemp1() + "'"); + if (!Cools.isEmpty(order.getTemp2())) content.put("Temp2", "'" + order.getTemp2() + "'"); + if (!Cools.isEmpty(order.getTemp3())) content.put("Temp3", "'" + order.getTemp3() + "'"); + if (!Cools.isEmpty(order.getCstmr())) content.put("ObjectId", "'" + order.getCstmr() + "'"); + if (!Cools.isEmpty(order.getCstmrName())) content.put("ObjectName", "'" + order.getCstmrName() + "'"); + if (!Cools.isEmpty(order.getMemo())) content.put("Remark", "'" + order.getMemo() + "'"); content.put("LKName", "'楂橀湒绔嬪簱'"); - content.put("b_pass", "1"); + content.put("bPass", "1"); int insert = erpSqlServer.insert(InHedTB.class, content); if (insert == 1) { log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content); @@ -164,9 +164,9 @@ */ @Transactional(rollbackFor = Throwable.class) public boolean insertOutDet(OrderDetl orderDetl) { - String sqlInDetTb = "select * from lk_OutDetTB where bill_no='" + orderDetl.getOrderNo() + "' and " + " item_id='" + orderDetl.getMatnr() + "' and item_batch='" + orderDetl.getBatch() + "' and pro_type='" + orderDetl.getSpecs() + "'"; + String sqlInDetTb = "select * from lk_OutDetTB where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and OrderNo='" + orderDetl.getOutOrderNo() + "' and proType='" + orderDetl.getProType() + "'"; List<OutDetTB> inDets = erpSqlServer.select(sqlInDetTb, OutDetTB.class); - String sqlInDetTbBak = "select * from lk_OutDetTB_Bak where bill_no='" + orderDetl.getOrderNo() + "' and " + " item_id='" + orderDetl.getMatnr() + "' and item_batch='" + orderDetl.getBatch() + "' and pro_type='" + orderDetl.getSpecs() + "'"; + String sqlInDetTbBak = "select * from lk_OutDetTB_Bak where BillNo='" + orderDetl.getOrderNo() + "' and " + " ItemId='" + orderDetl.getMatnr() + "' and OrderNo='" + orderDetl.getOutOrderNo() + "' and proType='" + orderDetl.getProType() + "'"; List<OutDetTBBak> inDetBaks = erpSqlServer.select(sqlInDetTbBak, OutDetTBBak.class); if (!inDets.isEmpty() || !inDetBaks.isEmpty()) { log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄨ韩宸插瓨鍦�:" + orderDetl.getOrderNo() + "==>>" + orderDetl.getOrderNo()); @@ -193,9 +193,9 @@ */ @Transactional(rollbackFor = Throwable.class) public boolean insertOutHed(Order order) { - String sqlInHedTb = "select * from lk_OutHedTB where LKName='楂橀湒绔嬪簱' and bill_no='" + order.getOrderNo() + "'"; + String sqlInHedTb = "select * from lk_OutHedTB where LKName='楂橀湒绔嬪簱' and BillNo='" + order.getOrderNo() + "'"; List<OutHedTB> outHeds = erpSqlServer.select(sqlInHedTb, OutHedTB.class); - String sqlInHedTbBak = "select * from lk_OutHedTB_Bak where LKName='楂橀湒绔嬪簱' and bill_no='" + order.getOrderNo() + "'"; + String sqlInHedTbBak = "select * from lk_OutHedTB_Bak where LKName='楂橀湒绔嬪簱' and BillNo='" + order.getOrderNo() + "'"; List<OutHedTBBak> inHedBaks = erpSqlServer.select(sqlInHedTbBak, OutHedTBBak.class); if (!outHeds.isEmpty() || !inHedBaks.isEmpty()) { log.error("璇ュ崟鍙锋枡鍙蜂腑闂磋〃琛ㄥご宸插瓨鍦�:" + order.getOrderNo()); @@ -203,21 +203,21 @@ } DocType docType = docTypeService.selectById(order.getDocType()); HashMap<String, Object> content = new HashMap<>(); - content.put("bill_no", "'" + order.getOrderNo() + "'"); - content.put("bill_no", "'" + DateUtils.convert(new Date()) + "'"); - if (!Cools.isEmpty(docType.getDocCode())) content.put("io_kind_id", "'" + docType.getDocCode() + "'"); - if (!Cools.isEmpty(docType.getDocName())) content.put("io_kind_name", "'" + docType.getDocName() + "'"); - if (!Cools.isEmpty(order.getWareId())) content.put("ware_id", "'" + order.getWareId() + "'"); - if (!Cools.isEmpty(order.getWareName())) content.put("ware_name", "'" + order.getWareName() + "'"); - if (!Cools.isEmpty(order.getUpdateTime())) content.put("make_date", "'" + order.getUpdateTime() + "'"); - if (!Cools.isEmpty(order.getTemp1())) content.put("temp1", "'" + order.getTemp1() + "'"); - if (!Cools.isEmpty(order.getTemp2())) content.put("temp2", "'" + order.getTemp2() + "'"); - if (!Cools.isEmpty(order.getTemp3())) content.put("temp3", "'" + order.getTemp3() + "'"); - if (!Cools.isEmpty(order.getCstmr())) content.put("object_id", "'" + order.getCstmr() + "'"); - if (!Cools.isEmpty(order.getCstmrName())) content.put("object_name", "'" + order.getCstmrName() + "'"); - if (!Cools.isEmpty(order.getMemo())) content.put("remark", "'" + order.getMemo() + "'"); + content.put("BillNo", "'" + order.getOrderNo() + "'"); + content.put("BillDate", "'" + DateUtils.convert(new Date()) + "'"); + if (!Cools.isEmpty(docType.getDocCode())) content.put("IoKindId", "'" + docType.getDocCode() + "'"); + if (!Cools.isEmpty(docType.getDocName())) content.put("IoKindName", "'" + docType.getDocName() + "'"); + if (!Cools.isEmpty(order.getWareId())) content.put("WareId", "'" + order.getWareId() + "'"); + if (!Cools.isEmpty(order.getWareName())) content.put("WareName", "'" + order.getWareName() + "'"); + if (!Cools.isEmpty(order.getUpdateTime())) content.put("MakeDate", "'" + order.getUpdateTime() + "'"); + if (!Cools.isEmpty(order.getTemp1())) content.put("Temp1", "'" + order.getTemp1() + "'"); + if (!Cools.isEmpty(order.getTemp2())) content.put("Temp2", "'" + order.getTemp2() + "'"); + if (!Cools.isEmpty(order.getTemp3())) content.put("Temp3", "'" + order.getTemp3() + "'"); + if (!Cools.isEmpty(order.getCstmr())) content.put("ObjectId", "'" + order.getCstmr() + "'"); + if (!Cools.isEmpty(order.getCstmrName())) content.put("ObjectName", "'" + order.getCstmrName() + "'"); + if (!Cools.isEmpty(order.getMemo())) content.put("Remark", "'" + order.getMemo() + "'"); content.put("LKName", "'楂橀湒绔嬪簱'"); - content.put("b_pass", "1"); + content.put("bPass", "1"); int insert = erpSqlServer.insert(OutHedTB.class, content); if (insert == 1) { log.info("鍏ュ簱鍗曡〃澶村洖浼犳垚鍔�:" + content); @@ -230,32 +230,32 @@ private Map<String, Object> getMap(OrderDetl orderDetl) { Map<String, Object> content = new HashMap<>(); - if (!Cools.isEmpty(orderDetl.getOrderNo())) content.put("bill_no", "'" + orderDetl.getOrderNo() + "'"); - if (!Cools.isEmpty(orderDetl.getINo())) content.put("i_no", "'" + orderDetl.getINo() + "'"); - if (!Cools.isEmpty(orderDetl.getThreeCode())) content.put("det_id", orderDetl.getThreeCode()); - if (!Cools.isEmpty(orderDetl.getMatnr())) content.put("item_id", "'" + orderDetl.getMatnr() + "'"); - if (!Cools.isEmpty(orderDetl.getModel())) content.put("item_code", "'" + orderDetl.getModel() + "'"); - if (!Cools.isEmpty(orderDetl.getBatch())) content.put("item_batch", "'" + orderDetl.getBatch() + "'"); - if (!Cools.isEmpty(orderDetl.getProType())) content.put("pro_type", "'" + orderDetl.getProType() + "'"); - if (!Cools.isEmpty(orderDetl.getUpdateTime())) content.put("make_date", "'" + orderDetl.getUpdateTime$() + "'"); - if (!Cools.isEmpty(orderDetl.getMemo())) content.put("remark", "'" + orderDetl.getMemo() + "'"); - if (!Cools.isEmpty(orderDetl.getOutOrderNo())) content.put("order_no", "'" + orderDetl.getOutOrderNo() + "'"); + if (!Cools.isEmpty(orderDetl.getOrderNo())) content.put("BillNo", "'" + orderDetl.getOrderNo() + "'"); + if (!Cools.isEmpty(orderDetl.getINo())) content.put("iNo", "'" + orderDetl.getINo() + "'"); + if (!Cools.isEmpty(orderDetl.getDetId())) content.put("DetId", orderDetl.getDetId()); + if (!Cools.isEmpty(orderDetl.getMatnr())) content.put("ItemId", "'" + orderDetl.getMatnr() + "'"); + if (!Cools.isEmpty(orderDetl.getModel())) content.put("ItemCode", "'" + orderDetl.getModel() + "'"); + if (!Cools.isEmpty(orderDetl.getBatch())) content.put("ItemBatch", "'" + orderDetl.getBatch() + "'"); + if (!Cools.isEmpty(orderDetl.getProType())) content.put("proType", "'" + orderDetl.getProType() + "'"); + if (!Cools.isEmpty(orderDetl.getUpdateTime())) content.put("MakeDate", "'" + orderDetl.getUpdateTime$() + "'"); + if (!Cools.isEmpty(orderDetl.getMemo())) content.put("Remark", "'" + orderDetl.getMemo() + "'"); + if (!Cools.isEmpty(orderDetl.getOutOrderNo())) content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'"); if (!Cools.isEmpty(orderDetl.getQty())) { if (orderDetl.getQty() > orderDetl.getAnfme() && orderDetl.getQty() > orderDetl.getWorkQty()) { log.info("淇閿欒鏁伴噺锛歿}", JSON.toJSON(orderDetl)); - content.put("main_num", orderDetl.getWorkQty()); + content.put("MainNum", orderDetl.getWorkQty()); } else { - content.put("main_num", orderDetl.getQty()); + content.put("MainNum", orderDetl.getQty()); } } - if (!Cools.isEmpty(orderDetl.getWareId())) content.put("ware_id", "'" + orderDetl.getWareId() + "'"); - if (!Cools.isEmpty(orderDetl.getWareName())) content.put("ware_name", "'" + orderDetl.getWareName() + "'"); - if (!Cools.isEmpty(orderDetl.getPacking())) content.put("packing", "'" + orderDetl.getPacking() + "'"); -// if (!Cools.isEmpty(orderDetl.getLuHao())) content.put("LuHao", "'" + orderDetl.getLuHao() + "'"); - if (!Cools.isEmpty(orderDetl.getSPgNO())) content.put("s_pg_no", "'" + orderDetl.getSPgNO() + "'"); - if (!Cools.isEmpty(orderDetl.getTemp1())) content.put("temp1", "'" + orderDetl.getTemp1() + "'"); - if (!Cools.isEmpty(orderDetl.getTemp2())) content.put("temp2", "'" + orderDetl.getTemp2() + "'"); - if (!Cools.isEmpty(orderDetl.getTemp3())) content.put("temp3", "'" + orderDetl.getTemp3() + "'"); + if (!Cools.isEmpty(orderDetl.getWareId())) content.put("WareId", "'" + orderDetl.getWareId() + "'"); + if (!Cools.isEmpty(orderDetl.getWareName())) content.put("WareName", "'" + orderDetl.getWareName() + "'"); + if (!Cools.isEmpty(orderDetl.getPacking())) content.put("Packing", "'" + orderDetl.getPacking() + "'"); + if (!Cools.isEmpty(orderDetl.getLuHao())) content.put("LuHao", "'" + orderDetl.getLuHao() + "'"); + if (!Cools.isEmpty(orderDetl.getSPgNO())) content.put("sPgNo", "'" + orderDetl.getSPgNO() + "'"); + if (!Cools.isEmpty(orderDetl.getTemp1())) content.put("Temp1", "'" + orderDetl.getTemp1() + "'"); + if (!Cools.isEmpty(orderDetl.getTemp2())) content.put("Temp2", "'" + orderDetl.getTemp2() + "'"); + if (!Cools.isEmpty(orderDetl.getTemp3())) content.put("Temp3", "'" + orderDetl.getTemp3() + "'"); content.put("LKName", "'楂橀湒绔嬪簱'"); return content; } -- Gitblit v1.9.1