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/erp/entity/ItemTB.java | 2
src/main/java/com/zy/third/erp/entity/InDetTB.java | 42 ++--
src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java | 24 +-
src/main/java/com/zy/third/erp/entity/OutDetTB.java | 46 ++--
src/main/java/com/zy/third/erp/entity/OutHedTB.java | 32 +-
src/main/java/com/zy/third/lk/entity/OutCancelTB.java | 55 ++++++
src/main/java/com/zy/third/erp/task/ERPItemScheduler.java | 2
src/main/java/com/zy/common/web/WcsController.java | 8
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 110 ++++++------
src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java | 12
src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java | 41 ++++
src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java | 8
src/main/java/com/zy/asrs/task/AgvScheduler.java | 2
src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java | 10
src/main/java/com/zy/third/erp/entity/InHedTB.java | 32 +-
src/main/java/com/zy/third/erp/entity/OutCancelTB.java | 4
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 6
src/main/java/com/zy/common/service/CommonService.java | 68 +------
src/main/resources/application.yml | 4
19 files changed, 281 insertions(+), 227 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index babb339..628d95b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -52,9 +52,9 @@
if(station.getAutoing()==null || !station.getAutoing().equals("Y")) {
throw new CoolException(devpNo+"绔欑偣涓嶆槸鑷姩鐘舵��");
}
- if(station.getLoading()==null || !station.getLoading().equals("Y")) {
- throw new CoolException(devpNo+"绔欑偣鏃犵墿");
- }
+// if(station.getLoading()==null || !station.getLoading().equals("Y")) {
+// throw new CoolException(devpNo+"绔欑偣鏃犵墿");
+// }
if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
}
diff --git a/src/main/java/com/zy/asrs/task/AgvScheduler.java b/src/main/java/com/zy/asrs/task/AgvScheduler.java
index 68cea4c..a1dec0a 100644
--- a/src/main/java/com/zy/asrs/task/AgvScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvScheduler.java
@@ -26,7 +26,7 @@
// 鍑哄簱鍛煎彨agv鎺ヨ揣
// 223鎴�123鏈夊嚭搴撶殑浠诲姟鍒欏懠鍙玜gv鎺ヨ揣
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
private void outboundCallAgvScheduler() {
// 鑾峰彇涓や釜绔欑偣鏈夌墿锛屾湁宸ヤ綔鍙�
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 45a495b..ddd63f7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -137,6 +137,7 @@
*/
@Transactional
public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ long start = System.currentTimeMillis();
int tagId = 0;
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
@@ -254,21 +255,7 @@
}
}
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
-// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
-// for (LocMast locMast1:locMasts){
-// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
-// continue;
-// }
-// String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
-// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",shallowLoc));
-// if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("D")){
-// locMast = locMast1;
-// break;
-// }
-// }
-// }
+
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
@@ -342,29 +329,7 @@
.eq("loc_sts", "O")
.orderBy("lev1",true).orderBy("bay1",true));
}
-// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
-// .eq("row1", nearRow)
-// .eq("loc_sts", "O")
-// .orderBy("lev1",true).orderBy("bay1",true));
-// for (LocMast locMast1 : locMasts) {
-// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
-// continue;
-// }
-// if (Utils.BooleanWhsTypeStaIoType(whsType)){
-//// String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
-// LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
-// .eq("loc_sts", "O"));
-// if (!Cools.isEmpty(locMast2)) {
-// locMast = locMast2;
-// break;
-// }
-// } else {
-// if (!Cools.isEmpty(locMast1)) {
-// locMast = locMast1;
-// break;
-// }
-// }
-// }
+
if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(whsType)){
if(tagId == 226){
@@ -376,17 +341,16 @@
}
}
locMasts = filteredLocMasts;
+ }else{
+ List<LocMast> filteredLocMasts = new ArrayList<>();
+ for (LocMast loc : locMasts) {
+ Integer lev = loc.getLev1();
+ if (lev != null && lev >= 1 && lev <= 5) {
+ filteredLocMasts.add(loc);
+ }
+ }
+ locMasts = filteredLocMasts;
}
-// if(tagId == 226){ //鍘熸潗鏂欐瘺鑳氱瓑
-// List<LocMast> filteredLocMasts = new ArrayList<>();
-// for (LocMast loc : locMasts) {
-// Integer lev = loc.getLev1();
-// if (lev != null && lev >= 1 && lev <= 5) {
-// filteredLocMasts.add(loc);
-// }
-// }
-// locMasts = filteredLocMasts;
-// }
for (LocMast locMast1 : locMasts) {
if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
@@ -412,12 +376,6 @@
times = times + 1;
return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo+1, locTypeDto, times);
}
-// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
-// if (locTypeDto.getLocType1() < 2) {
-// int i = locTypeDto.getLocType1() + 1;
-// locTypeDto.setLocType1((short)i);
-// return getLocNo(1, staDescId, sourceStaNo, matnr,batch,grade, locTypeDto, 0);
-// }
log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
throw new CoolException("娌℃湁绌哄簱浣嶆垨鍫嗗灈鏈哄紓甯�");
}
@@ -430,6 +388,8 @@
startupDto.setCrnNo(crnNo);
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setLocNo(locNo);
+ log.info("搴撲綅妫�绱㈣�楁椂: {} ms", System.currentTimeMillis() - start);
+
return startupDto;
}
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 807c67e..e54971f 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -96,12 +96,6 @@
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
- try {
- // 寤惰繜 3 绉掑啀妫�娴�
- Thread.sleep(3000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
sourceStaNo.setLocType1(param.getLocType1());
@@ -328,6 +322,7 @@
*/
@Transactional
public StartupDto startupFullPutStore(Integer devpNo, String barcode,Double weight, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ long start = System.currentTimeMillis();
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -423,6 +418,7 @@
} else {
throw new CoolException(dto.getLocNo() + "鐩爣搴撲綅宸茶鍗犵敤");
}
+ log.info("搴撲綅妫�绱㈣�楁椂: {} ms", System.currentTimeMillis() - start);
return dto;
}
diff --git a/src/main/java/com/zy/third/erp/entity/InDetTB.java b/src/main/java/com/zy/third/erp/entity/InDetTB.java
index 6e547b0..8d5667f 100644
--- a/src/main/java/com/zy/third/erp/entity/InDetTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InDetTB.java
@@ -25,73 +25,73 @@
@TableId(value = "AutoId", type = IdType.AUTO)
- @TableField("auto_id")
+ @TableField("AutoId")
private Integer AutoId;
@ApiModelProperty(value = "")
- @TableField("bill_no")
+ @TableField("BillNo")
private String BillNo;
@ApiModelProperty(value = "")
- @TableField("i_no")
+ @TableField("iNO")
private Integer iNO;
/**
* erp琛屽敮涓�鐮�
*/
@ApiModelProperty(value = "erp琛屽敮涓�鐮�")
- @TableField("det_id")
+ @TableField("DetId")
private Integer detId;
@ApiModelProperty(value = "")
- @TableField("item_id")
+ @TableField("ItemId")
private String ItemId;
@ApiModelProperty(value = "")
- @TableField("item_code")
+ @TableField("ItemCode")
private String ItemCode;
@ApiModelProperty(value = "")
- @TableField("item_batch")
+ @TableField("ItemBatch")
private String ItemBatch;
@ApiModelProperty(value = "")
- @TableField("pro_type")
+ @TableField("proType")
private String protype;
@ApiModelProperty(value = "")
- @TableField("order_no")
+ @TableField("OrderNo")
private String OrderNo;
@ApiModelProperty(value = "")
- @TableField("main_num")
+ @TableField("MainNum")
private Double MainNum;
@ApiModelProperty(value = "")
- @TableField("remark")
+ @TableField("Remark")
private String remark;
- @TableField("ware_id")
+ @TableField("WareId")
private String wareId;
- @TableField("ware_name")
+ @TableField("WareName")
private String WareName;
@ApiModelProperty(value = "")
- @TableField("temp1")
+ @TableField("Temp1")
private String temp1;
@ApiModelProperty(value = "")
- @TableField("temp2")
+ @TableField("Temp2")
private String temp2;
@ApiModelProperty(value = "")
- @TableField("temp3")
+ @TableField("Temp3")
private String temp3;
@ApiModelProperty(value = "")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("make_date")
+ @TableField("MakeDate")
private Date makedate;
@ApiModelProperty(value = "")
@@ -101,17 +101,17 @@
/**
*
*/
- @TableField("fact_area")
+ @TableField("FactArea")
private String FactArea;
/**
* 渚涘簲鍟哱瀹㈡埛ID
*/
- @TableField("packing")
+ @TableField("Packing")
private String Packing;
/**
* 棰滆壊
*/
- @TableField("s_color")
+ @TableField("sColor")
private String sColor;
// /**
@@ -123,7 +123,7 @@
/**
* 宸ュ崟鍙�
*/
- @TableField("s_pg_no")
+ @TableField("sPgNO")
private String sPgNO;
diff --git a/src/main/java/com/zy/third/erp/entity/InHedTB.java b/src/main/java/com/zy/third/erp/entity/InHedTB.java
index 8a6abca..b070c42 100644
--- a/src/main/java/com/zy/third/erp/entity/InHedTB.java
+++ b/src/main/java/com/zy/third/erp/entity/InHedTB.java
@@ -18,12 +18,12 @@
@TableId(value = "AutoId", type = IdType.AUTO)
- @TableField("auto_id")
+ @TableField("AutoId")
private Integer AutoId;
@ApiModelProperty(value = "")
- @TableId(value = "bill_no", type = IdType.INPUT)
- @TableField("bill_no")
+ @TableId(value = "BillNo", type = IdType.INPUT)
+ @TableField("BillNo")
private String BillNo;
/**
@@ -34,55 +34,55 @@
* CheckMoreIn:鐩樼泩鍏ュ簱鍗�
*/
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("bill_date")
+ @TableField("BillDate")
private Date BillDate;
- @TableField("io_kind_id")
+ @TableField("IoKindId")
private String IoKindID;
- @TableField("io_kind_name")
+ @TableField("IoKindName")
private String ioKindName;
/**
* 渚涘簲鍟嗐�侀儴闂↖D
*/
@ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂↖D")
- @TableField("object_id")
+ @TableField("ObjectId")
private String ObjectId;
/**
* 渚涘簲鍟嗐�侀儴闂ㄥ悕绉�
*/
- @TableField("object_name")
+ @TableField("ObjectName")
@ApiModelProperty(value = "渚涘簲鍟嗐�侀儴闂ㄥ悕绉�")
private String ObjectName;
@ApiModelProperty(value = "")
- @TableField("remark")
+ @TableField("Remark")
private String remark;
- @TableField("ware_id")
+ @TableField("WareId")
private String wareId;
- @TableField("ware_name")
+ @TableField("WareName")
private String wareName;
@ApiModelProperty(value = "")
- @TableField("temp1")
+ @TableField("Temp1")
private String Temp1;
@ApiModelProperty(value = "")
- @TableField("temp2")
+ @TableField("Temp2")
private String Temp2;
@ApiModelProperty(value = "")
- @TableField("temp3")
+ @TableField("Temp3")
private String Temp3;
@ApiModelProperty(value = "")
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @TableField("make_date")
+ @TableField("MakeDate")
private Date MakeDate;
@ApiModelProperty(value = "")
@@ -92,7 +92,7 @@
/**
*
*/
- @TableField("fact_area")
+ @TableField("FactArea")
private String FactArea;
diff --git a/src/main/java/com/zy/third/erp/entity/ItemTB.java b/src/main/java/com/zy/third/erp/entity/ItemTB.java
index 57fcb1e..fab4790 100644
--- a/src/main/java/com/zy/third/erp/entity/ItemTB.java
+++ b/src/main/java/com/zy/third/erp/entity/ItemTB.java
@@ -21,7 +21,7 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "auto_id", type = IdType.AUTO)
+ @TableId(value = "AutoId", type = IdType.AUTO)
private Integer AutoId;
@ApiModelProperty(value = "")
diff --git a/src/main/java/com/zy/third/erp/entity/OutCancelTB.java b/src/main/java/com/zy/third/erp/entity/OutCancelTB.java
index 2f05237..5d8498b 100644
--- a/src/main/java/com/zy/third/erp/entity/OutCancelTB.java
+++ b/src/main/java/com/zy/third/erp/entity/OutCancelTB.java
@@ -35,6 +35,10 @@
@TableField("LKName")
private String LKName;
+ @ApiModelProperty(value = "")
+ @TableField("FactArea")
+ private String FactArea;
+
public String getMakedate$() {
if (Cools.isEmpty(this.MakeDate)) {
diff --git a/src/main/java/com/zy/third/erp/entity/OutDetTB.java b/src/main/java/com/zy/third/erp/entity/OutDetTB.java
index 7ece66f..0354418 100644
--- a/src/main/java/com/zy/third/erp/entity/OutDetTB.java
+++ b/src/main/java/com/zy/third/erp/entity/OutDetTB.java
@@ -23,70 +23,70 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "auto_id", type = IdType.AUTO)
- @TableField("auto_id")
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ @TableField("AutoId")
private Integer AutoId;
@ApiModelProperty(value = "")
- @TableField("bill_no")
+ @TableField("BillNo")
private String BillNo;
@ApiModelProperty(value = "")
- @TableField("i_no")
+ @TableField("iNO")
private Integer iNO;
@ApiModelProperty(value = "")
- @TableField("det_id")
+ @TableField("DetId")
private Integer detId;
@ApiModelProperty(value = "")
- @TableField("item_id")
+ @TableField("ItemId")
private String ItemId;
@ApiModelProperty(value = "")
- @TableField("item_code")
+ @TableField("ItemCode")
private String ItemCode;
@ApiModelProperty(value = "")
- @TableField("item_batch")
+ @TableField("ItemBatch")
private String ItemBatch;
@ApiModelProperty(value = "")
- @TableField("pro_type")
+ @TableField("proType")
private String proType;
@ApiModelProperty(value = "")
- @TableField("order_no")
+ @TableField("OrderNo")
private String OrderNo;
@ApiModelProperty(value = "")
- @TableField("main_num")
+ @TableField("MainNum")
private Double MainNum;
- @TableField("remark")
+ @TableField("Remark")
private String remark;
- @TableField("ware_id")
+ @TableField("WareId")
private String wareId;
- @TableField("ware_name")
+ @TableField("WareName")
private String wareName;
@ApiModelProperty(value = "")
- @TableField("temp1")
+ @TableField("Temp1")
private String temp1;
@ApiModelProperty(value = "")
- @TableField("temp2")
+ @TableField("Temp2")
private String temp2;
@ApiModelProperty(value = "")
- @TableField("temp3")
+ @TableField("Temp3")
private String temp3;
@ApiModelProperty(value = "")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("make_date")
+ @TableField("MakeDate")
private Date makedate;
// @ApiModelProperty(value= "")
@@ -95,7 +95,7 @@
// private Date delDate;
@ApiModelProperty(value = "")
- @TableField("pro_type")
+ @TableField("proType")
private String protype;
@ApiModelProperty(value = "")
@@ -103,18 +103,18 @@
private String LKName;
- @TableField("fact_area")
+ @TableField("FactArea")
private String FactArea;
/**
* 渚涘簲鍟哱瀹㈡埛ID
*/
- @TableField("packing")
+ @TableField("Packing")
private String Packing;
/**
* 棰滆壊
*/
- @TableField("s_color")
+ @TableField("sColor")
private String sColor;
// /**
@@ -126,7 +126,7 @@
/**
* 宸ュ崟鍙�
*/
- @TableField("s_pg_no")
+ @TableField("sPgNO")
private String sPgNO;
public String getMakedate$() {
diff --git a/src/main/java/com/zy/third/erp/entity/OutHedTB.java b/src/main/java/com/zy/third/erp/entity/OutHedTB.java
index bb5e611..bf935e3 100644
--- a/src/main/java/com/zy/third/erp/entity/OutHedTB.java
+++ b/src/main/java/com/zy/third/erp/entity/OutHedTB.java
@@ -21,16 +21,16 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "auto_id", type = IdType.AUTO)
+ @TableId(value = "AutoId", type = IdType.AUTO)
private Integer AutoId;
@ApiModelProperty(value = "")
- @TableId(value = "bill_no", type = IdType.INPUT)
- @TableField("bill_no")
+ @TableId(value = "BillNo", type = IdType.INPUT)
+ @TableField("BillNo")
private String BillNo;
- @TableField("bill_date")
+ @TableField("BillDate")
// @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date BillDate;
@@ -42,59 +42,59 @@
* CheckLossOut:鐩樼泩鍑哄簱鍗�
*/
@ApiModelProperty(value = "SendMatOut:鍙戞枡鍑哄簱 ")
- @TableField("io_kind_id")
+ @TableField("IoKindID")
private String IoKindID;
- @TableField("io_kind_name")
+ @TableField("IoKindName")
private String ioKindName;
/**
* 閮ㄩ棬ID
*/
@ApiModelProperty(value = "閮ㄩ棬ID")
- @TableField("object_id")
+ @TableField("ObjectId")
private String ObjectId;
/**
* 閮ㄩ棬鍚嶇О
*/
@ApiModelProperty(value = "閮ㄩ棬鍚嶇О")
- @TableField("object_name")
+ @TableField("ObjectName")
private String ObjectName;
@ApiModelProperty(value = "")
- @TableField("remark")
+ @TableField("Remark")
private String remark;
- @TableField("ware_id")
+ @TableField("WareId")
private String wareId;
- @TableField("ware_id")
+ @TableField("WareName")
private String wareName;
@ApiModelProperty(value = "")
- @TableField("temp1")
+ @TableField("Temp1")
private String Temp1;
@ApiModelProperty(value = "")
- @TableField("temp2")
+ @TableField("Temp2")
private String Temp2;
@ApiModelProperty(value = "")
- @TableField("temp3")
+ @TableField("Temp3")
private String Temp3;
@ApiModelProperty(value = "")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @TableField("make_date")
+ @TableField("MakeDate")
private Date MakeDate;
@ApiModelProperty(value = "")
@TableField("LKName")
private String LKName;
- @TableField("fact_area")
+ @TableField("FactArea")
private String FactArea;
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
index 6dc1a2a..08c3a38 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInCancelScheduler.java
@@ -27,17 +27,17 @@
@Transactional(rollbackFor = Throwable.class)
- //@Scheduled(cron = "${erp.refreshtime}")
+ @Scheduled(cron = "${erp.refreshtime}")
public void InCancelScheduler() {
if (!erpEnabled) return;
- String sqlInCancelTB = "select * from erp_InCancelTB where LKName='楂橀湒绔嬪簱'";
+ String sqlInCancelTB = "select * from erp_InCancelTB ";
List<InCancelTB> ins = erpSqlServer.select(sqlInCancelTB, InCancelTB.class);
for (InCancelTB in : ins) {
- com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
+ com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancelIn(in.getBillNo());
if (lkCancel != null) {
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + in.getBillNo() + "'");
- int delete = erpSqlServer.delete(InCancelTB.class, condition);
+ int delete = erpSqlServer.delete(com.zy.third.erp.entity.InCancelTB.class, condition);
if (delete > 0) {
log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゆ垚鍔�,{}", lkCancel.getBillNo());
} else {
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 8802c0e..08ea63c 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInHedTBScheduler.java
@@ -48,7 +48,7 @@
//continue;
}
HashMap<String, String> condition = new HashMap<>();
- condition.put("bill_no", "'" + inHed.getBillNo() + "'");
+ condition.put("BillNo", "'" + inHed.getBillNo() + "'");
List<InDetTB> inDetTBS = erpSqlServer.selectList(InDetTB.class, condition);
HashMap<String, Object> hedAndDet = new HashMap<>();
hedAndDet.put("hed", inHed);
@@ -63,7 +63,7 @@
} catch (Exception e) {
log.info(e.getMessage());
//e.printStackTrace();
- String sql = "UPDATE erp_InHedTB SET Temp3 = 'fault' WHERE bill_no = '" + inHed.getBillNo() + "'";
+ String sql = "UPDATE erp_InHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
erpSqlServer.update(sql);
}
}
@@ -76,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("bill_no", "'" + hed.getBillNo() + "'");
+ condition.put("BillNo", "'" + hed.getBillNo() + "'");
erpSqlServer.delete(InHedTB.class, condition);
for (InDetTB det : dets) {
HashMap<String, String> condition2 = new HashMap<>();
- condition2.put("bill_no", "'" + det.getBillNo() + "'");
- condition2.put("i_no", String.valueOf(det.getINO()));
+ condition2.put("BillNo", "'" + det.getBillNo() + "'");
+ condition2.put("iNo", String.valueOf(det.getINO()));
erpSqlServer.delete(InDetTB.class, condition2);
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java
index a2b3f8f..eeb50f0 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutCancelService.java
@@ -24,7 +24,7 @@
private OrderDetlService orderDetlService;
- public com.zy.third.lk.entity.InCancelTB tryCancel(String orderNo) {
+ public com.zy.third.lk.entity.InCancelTB tryCancelIn(String orderNo) {
com.zy.third.lk.entity.InCancelTB lkCancel = new com.zy.third.lk.entity.InCancelTB();
List<Order> targets = orderService.selectList(new EntityWrapper<Order>()
@@ -62,5 +62,44 @@
}
+ public com.zy.third.lk.entity.OutCancelTB tryCancelOut(String orderNo) {
+ com.zy.third.lk.entity.OutCancelTB lkCancel = new com.zy.third.lk.entity.OutCancelTB();
+
+ List<Order> targets = orderService.selectList(new EntityWrapper<Order>()
+ .eq("order_no",orderNo));
+ log.info("瑕佸彇娑堢殑璁㈠崟锛歿}", targets);
+ if (targets.isEmpty()) {
+ lkCancel.setBillNo(orderNo);
+ lkCancel.setOpFlag(1);
+
+ //erp鏂硅姹�,璁㈠崟鎵句笉鍒�,杩斿洖1
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ } else {
+ //榛樿璁㈠崟id涓嶈兘閲嶅
+ Order order = targets.get(0);
+ List<OrderDetl> detlList = orderDetlService.selectItem(order.getOrderNo());
+ log.info("瑕佸彇娑堢殑璁㈠崟璇︽儏锛歿}", detlList);
+ Optional<OrderDetl> any = detlList.stream().filter(s -> s.getQty().compareTo(0D) > 0).findAny();
+ if (order.getSettle() > 1L || any.isPresent()) {
+ lkCancel.setBillNo(orderNo);
+ lkCancel.setOpFlag(2);
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ }
+ orderService.addToLogTable(order);
+ orderService.delete(new EntityWrapper<Order>()
+ .eq("order_no", order.getOrderNo()));
+ detlList.stream().forEach(d -> orderDetlService.addToLogTable(d));
+ orderDetlService.delete(new EntityWrapper<OrderDetl>()
+ .eq("order_no", order.getOrderNo()));
+ lkCancel.setBillNo(orderNo);
+ lkCancel.setOpFlag(1);
+ lkCancel.setMakeDate(new Date());
+ return lkCancel;
+ }
+
+ }
+
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
index 7106d57..bbdc2f6 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -59,6 +59,6 @@
*/
//灏嗘暟鎹粠涓昏〃绉诲姩鍒癰ak琛ㄩ噷
private void moveToBak(ItemTB itemTB) {
- erpSqlServer.update("delete from erp_ItemTB where LKName='楂橀湒绔嬪簱' and Item_id = '" + itemTB.getItemId() + "'");
+ erpSqlServer.update("delete from erp_ItemTB where LKName='楂橀湒绔嬪簱' and ItemId = '" + itemTB.getItemId() + "'");
}
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
index 3a42393..84c47f2 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutCancelScheduler.java
@@ -28,34 +28,34 @@
@Transactional(rollbackFor = Throwable.class)
- //@Scheduled(cron = "${erp.refreshtime}")
- public void InCancelScheduler() {
+ @Scheduled(cron = "${erp.refreshtime}")
+ public void OutCancelScheduler() {
//log.info("InCancelScheduler寮�濮嬩簡");
if (!erpEnabled) return;
- String sqlInCancelTB = "select * from erp_OutCancelTB where LKName='楂橀湒绔嬪簱'";
+ String sqlInCancelTB = "select * from erp_OutCancelTB";
List<OutCancelTB> ins = erpSqlServer.select(sqlInCancelTB, OutCancelTB.class);
for (OutCancelTB in : ins) {
- com.zy.third.lk.entity.InCancelTB lkCancel = inMS.tryCancel(in.getBillNo());
+ com.zy.third.lk.entity.OutCancelTB lkCancel = inMS.tryCancelOut(in.getBillNo());
if (lkCancel != null) {
HashMap<String, String> condition = new HashMap<>();
condition.put("BillNo", "'" + in.getBillNo() + "'");
- int delete = erpSqlServer.delete(InCancelTB.class, condition);
+ int delete = erpSqlServer.delete(com.zy.third.erp.entity.OutCancelTB.class, condition);
if (delete > 0) {
- log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゆ垚鍔�,{}", lkCancel.getBillNo());
+ log.info("灏嗗嚭搴撳彇娑堥�氱煡鍗曞垹闄ゆ垚鍔�,{}", lkCancel.getBillNo());
} else {
- log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞垹闄ゅけ璐�,{}", lkCancel.getBillNo());
+ log.error("灏嗗嚭搴撳彇娑堥�氱煡鍗曞垹闄ゅけ璐�,{}", lkCancel.getBillNo());
}
HashMap<String, Object> content = new HashMap<>();
content.put("BillNo", "'" + lkCancel.getBillNo() + "'");
- content.put("opFlag", lkCancel.getOpFlag());
- int insert = erpSqlServer.insert(com.zy.third.lk.entity.InCancelTB.class, content);
+// content.put("opFlag", lkCancel.getOpFlag());
+ int insert = erpSqlServer.insert(com.zy.third.lk.entity.OutCancelTB.class, content);
if (insert > 0) {
- log.info("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ユ垚鍔�,{}", lkCancel.getBillNo());
+ log.info("灏嗗嚭搴撳彇娑堥�氱煡鍗曞啓鍏ユ垚鍔�,{}", lkCancel.getBillNo());
} else {
- log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�,{}", lkCancel.getBillNo());
+ log.error("灏嗗嚭搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�,{}", lkCancel.getBillNo());
}
} else {
- log.error("灏嗗叆搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�");
+ log.error("灏嗗嚭搴撳彇娑堥�氱煡鍗曞啓鍏ュけ璐�");
}
}
}
diff --git a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
index abe3b38..8fb4790 100644
--- a/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPOutHedTBScheduler.java
@@ -49,7 +49,7 @@
//continue;
}
HashMap<String, String> condition = new HashMap<>();
- condition.put("bill_no", "'" + inHed.getBillNo() + "'");
+ condition.put("BillNO", "'" + inHed.getBillNo() + "'");
List<OutDetTB> inDetTBS = erpSqlServer.selectList(OutDetTB.class, condition);
HashMap<String, Object> hedAndDet = new HashMap<>();
hedAndDet.put("hed", inHed);
@@ -64,7 +64,7 @@
} catch (Exception e) {
log.info(e.getMessage());
// e.printStackTrace();
- String sql = "UPDATE erp_OutHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
+ String sql = "UPDATE erp_OutHedTB SET Remark = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
erpSqlServer.update(sql);
//
}
@@ -96,7 +96,7 @@
} catch (Exception e) {
log.info(e.getMessage());
// e.printStackTrace();
- String sql = "UPDATE erp_OutHedTB SET Temp3 = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
+ String sql = "UPDATE erp_OutHedTB SET Remark = 'fault' WHERE BillNo = '" + inHed.getBillNo() + "'";
erpSqlServer.update(sql);
//
}
@@ -109,12 +109,12 @@
OutHedTB hed = (OutHedTB) hedAndDet.get("hed");
ArrayList<OutDetTB> dets = (ArrayList<OutDetTB>) hedAndDet.get("det");
HashMap<String, String> condition = new HashMap<>();
- condition.put("bill_no", "'" + hed.getBillNo() + "'");
+ condition.put("BillNo", "'" + hed.getBillNo() + "'");
erpSqlServer.delete(OutHedTB.class, condition);
for (OutDetTB det : dets) {
HashMap<String, String> condition2 = new HashMap<>();
- condition2.put("bill_no", "'" + det.getBillNo() + "'");
- condition2.put("i_no", String.valueOf(det.getINO()));
+ condition2.put("BillNo", "'" + det.getBillNo() + "'");
+ condition2.put("iNo", String.valueOf(det.getINO()));
erpSqlServer.delete(OutDetTB.class, condition2);
}
diff --git a/src/main/java/com/zy/third/lk/entity/OutCancelTB.java b/src/main/java/com/zy/third/lk/entity/OutCancelTB.java
new file mode 100644
index 0000000..831ae65
--- /dev/null
+++ b/src/main/java/com/zy/third/lk/entity/OutCancelTB.java
@@ -0,0 +1,55 @@
+package com.zy.third.lk.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@Data
+@TableName("lk_OutCancelTB")
+public class OutCancelTB implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "AutoId", type = IdType.AUTO)
+ private Integer AutoId;
+
+ @ApiModelProperty(value = "")
+ @TableField("BillNo")
+ private String BillNo;
+
+ @ApiModelProperty(value = "")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("MakeDate")
+ private Date MakeDate;
+
+ @ApiModelProperty(value = "")
+ @TableField("opFlag")
+ private Integer opFlag;
+
+ @ApiModelProperty(value = "")
+ @TableField("LKName")
+ private String LKName;
+
+ @ApiModelProperty(value = "")
+ @TableField("FactArea")
+ private String FactArea;
+
+
+ public String getMakedate$() {
+ if (Cools.isEmpty(this.MakeDate)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.MakeDate);
+ }
+
+
+}
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;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9053b8d..10433b5 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -110,6 +110,6 @@
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://192.168.16.202:9116;databasename=TZGLLK
- username: GLLK
- password: GLLK0626
+ username: gllk2
+ password: gllk250722
--
Gitblit v1.9.1