From cef8161169e99e299eefb7c67eeb4cb6e41d99f2 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期六, 27 七月 2024 14:53:46 +0800
Subject: [PATCH] 代码bug修改调试
---
src/main/resources/mapper/OrderMapper.xml | 5 +
src/main/webapp/static/css/common.css | 4 +
src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java | 31 ++++++++++
src/main/java/com/zy/third/erp/task/ERPItemService.java | 4
src/main/java/com/zy/asrs/controller/LocDetlController.java | 1
src/main/java/com/zy/asrs/service/DocTypeService.java | 2
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 1
src/main/java/com/zy/third/erp/task/ERPInOrOutService.java | 19 +++++-
src/main/java/com/zy/third/erp/task/ERPItemScheduler.java | 2
src/main/java/com/zy/asrs/entity/Order.java | 15 +++++
src/main/java/com/zy/third/lk/task/LKInTBScheduler.java | 41 +++++++------
11 files changed, 96 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index f7a0365..a69fc16 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -241,7 +241,6 @@
public R statis(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param) {
- System.out.println(JSONObject.toJSON(param));
Page<StockStatisDTO> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, StockStatisDTO.class));
return R.ok().add(stockStatis);
}
diff --git a/src/main/java/com/zy/asrs/entity/Order.java b/src/main/java/com/zy/asrs/entity/Order.java
index bbfd19e..fd13474 100644
--- a/src/main/java/com/zy/asrs/entity/Order.java
+++ b/src/main/java/com/zy/asrs/entity/Order.java
@@ -268,6 +268,21 @@
@TableField("move_status")
private Integer moveStatus;
+ @TableField("ware_id")
+ private String wareId;
+
+ @TableField("ware_name")
+ private String wareName;
+
+ @TableField("temp1")
+ private String temp1;
+
+ @TableField("temp2")
+ private String temp2;
+
+ @TableField("temp3")
+ private String temp3;
+
public Order() {}
public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,String cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/src/main/java/com/zy/asrs/service/DocTypeService.java b/src/main/java/com/zy/asrs/service/DocTypeService.java
index 35e585d..2291721 100644
--- a/src/main/java/com/zy/asrs/service/DocTypeService.java
+++ b/src/main/java/com/zy/asrs/service/DocTypeService.java
@@ -7,4 +7,6 @@
DocType selectOrAdd(String docName, Boolean pakin);
+ DocType selectOrAdd(String docName,String docType, Boolean pakin);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
index 4f2a66d..e98c590 100644
--- a/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/DocTypeServiceImpl.java
@@ -15,6 +15,7 @@
public class DocTypeServiceImpl extends ServiceImpl<DocTypeMapper, DocType> implements DocTypeService {
@Override
+ @Deprecated
public DocType selectOrAdd(String docName, Boolean pakin) {
if (Cools.isEmpty(docName)) {
return null;
@@ -42,4 +43,34 @@
}
return docType;
}
+
+ @Override
+ public DocType selectOrAdd(String docName, String dccType, Boolean pakin) {
+ if (Cools.isEmpty(docName) || Cools.isEmpty(docName)) {
+ return null;
+ }
+ DocType docType = this.selectOne(new EntityWrapper<DocType>().eq("doc_code", dccType));
+ if (docType == null) {
+ long docId = 1L;
+ DocType last = this.selectOne(new EntityWrapper<DocType>().orderBy("doc_id", false));
+ if (last != null) {
+ docId = last.getDocId() + 1;
+ }
+ docType = new DocType();
+ docType.setDocId(docId);
+ docType.setDocName(docName);
+ docType.setDocCode(dccType);
+ if (null != pakin) {
+ docType.setPakin(pakin ? 1 : 0);
+ docType.setPakout(pakin ? 0 : 1);
+ }
+ docType.setStatus(1);
+ docType.setCreateTime(new Date());
+ docType.setUpdateTime(new Date());
+ if (!this.insert(docType)) {
+ throw new CoolException("鍗曟嵁绫诲瀷閿欒");
+ }
+ }
+ return docType;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 130ed88..2698d7b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -59,7 +59,6 @@
@Override
public Page<StockStatisDTO> getStockStatis(Page<StockStatisDTO> page) {
- System.out.println(JSONObject.toJSON(page));
page.setRecords(baseMapper.asrsAndErpList(page.getCondition()));
page.setTotal(baseMapper.asrsAndErpCount(page.getCondition()));
return page;
diff --git a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
index 6904b70..ef5d846 100644
--- a/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPInOrOutService.java
@@ -61,7 +61,7 @@
}
orderService.remove(order.getId());
}
- DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+ DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindName(), inHedTB.getIoKindID(), Boolean.TRUE);
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
@@ -100,11 +100,16 @@
inHedTB.getMakeDate(), // 淇敼鏃堕棿
inHedTB.getRemark() // 澶囨敞
);
+ order.setTemp1(inHedTB.getTemp1());
+ order.setTemp2(inHedTB.getTemp2());
+ order.setTemp3(inHedTB.getTemp3());
+ order.setWareId(inHedTB.getWareId());
+ order.setWareName(inHedTB.getWareName());
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
for (InDetTB outDetTB : inDetTBs) {
- Mat mat = matService.selectByMatnr(outDetTB.getItemCode());
+ Mat mat = matService.selectByMatnr(outDetTB.getItemId());
if (Cools.isEmpty(mat)) {
throw new CoolException(outDetTB.getItemCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
@@ -154,7 +159,7 @@
}
orderService.remove(order.getId());
}
- DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindID(), Boolean.FALSE);
+ DocType docType = docTypeService.selectOrAdd(inHedTB.getIoKindName(),inHedTB.getIoKindID(), Boolean.FALSE);
Date now = new Date();
// 鍗曟嵁涓绘。
order = new Order(
@@ -193,11 +198,17 @@
inHedTB.getMakeDate(), // 淇敼鏃堕棿
inHedTB.getRemark() // 澶囨敞
);
+ order.setTemp1(inHedTB.getTemp1());
+ order.setTemp2(inHedTB.getTemp2());
+ order.setTemp3(inHedTB.getTemp3());
+ order.setWareId(inHedTB.getWareId());
+ order.setWareName(inHedTB.getWareName());
+
if (!orderService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
for (OutDetTB outDetTB : inDetTBs) {
- Mat mat = matService.selectByMatnr(outDetTB.getItemCode());
+ Mat mat = matService.selectByMatnr(outDetTB.getItemId());
if (Cools.isEmpty(mat)) {
throw new CoolException(outDetTB.getItemCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
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 703e185..f5dd32b 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemScheduler.java
@@ -33,7 +33,7 @@
public void ItemScheduler() {
//log.info("ItemScheduler寮�濮嬩簡");
if (!erpEnabled) return;
- String sqlItemTB = "select * from erp_ItemTB where LKName='涓壃浜屾湡'";
+ String sqlItemTB = "select TOP 1000 * from erp_ItemTB where LKName='涓壃浜屾湡'";
List<ItemTB> itemTBS = erpSqlServer.select(sqlItemTB, ItemTB.class);
if (itemTBS != null && itemTBS.size() > 0) {
for (ItemTB itemTB : itemTBS) {
diff --git a/src/main/java/com/zy/third/erp/task/ERPItemService.java b/src/main/java/com/zy/third/erp/task/ERPItemService.java
index 58d4f88..7a0fc71 100644
--- a/src/main/java/com/zy/third/erp/task/ERPItemService.java
+++ b/src/main/java/com/zy/third/erp/task/ERPItemService.java
@@ -98,8 +98,8 @@
}
private Mat sync(Mat mat, ItemTB itemTB) {
- mat.setUuid(itemTB.getItemId());
- mat.setMatnr(itemTB.getItemCode());
+ mat.setModel(itemTB.getItemCode());
+ mat.setMatnr(itemTB.getItemId());
mat.setMaktx(itemTB.getItemName());
mat.setSpecs(itemTB.getItemSpc());
mat.setUnit(itemTB.getItemUnit());
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 69dfab0..16a3b57 100644
--- a/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
+++ b/src/main/java/com/zy/third/lk/task/LKInTBScheduler.java
@@ -1,6 +1,7 @@
package com.zy.third.lk.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
@@ -52,7 +53,7 @@
List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L));
DocType docType;
for (Order order : orders) {
- System.out.println(order);
+
docType = docTypeService.selectById(order.getDocType());
if (docType == null) {
log.error("璇ヨ鍗曠被鍨嬩笉瀛樺湪:" + order.getDocType());
@@ -216,25 +217,25 @@
private Map<String, Object> getMap(OrderDetl orderDetl) {
Map<String, Object> content = new HashMap<>();
- content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
- content.put("iNO", "'" + orderDetl.getINO() + "'");
- content.put("detId", orderDetl.getThreeCode());
- content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
- content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
- content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
- content.put("proType", "'" + orderDetl.getProType() + "'");
- content.put("remark", "'" + orderDetl.getMemo() + "'");
- content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'");
- content.put("MainNum", orderDetl.getQty());
- content.put("WareId", "'" + orderDetl.getWareId() + "'");
- content.put("WareName", "'" + orderDetl.getWareName() + "'");
- content.put("Packing", "'" + orderDetl.getPacking() + "'");
- content.put("LuHao", "'" + orderDetl.getLuHao() + "'");
- content.put("sPgNO", "'" + orderDetl.getSPgNO() + "'");
- content.put("temp1", "'" + orderDetl.getTemp1() + "'");
- content.put("temp2", "'" + orderDetl.getTemp2() + "'");
- content.put("temp3", "'" + orderDetl.getTemp3() + "'");
- content.put("LKName", "'涓壃浜屾湡'");
+ if (!Cools.isEmpty()) content.put("BillNo", "'" + orderDetl.getOrderNo() + "'");
+ if (!Cools.isEmpty()) content.put("iNO", "'" + orderDetl.getINO() + "'");
+ if (!Cools.isEmpty()) content.put("detId", orderDetl.getThreeCode());
+ if (!Cools.isEmpty()) content.put("ItemId", "'" + orderDetl.getThreeCode() + "'");
+ if (!Cools.isEmpty()) content.put("ItemCode", "'" + orderDetl.getMatnr() + "'");
+ if (!Cools.isEmpty()) content.put("ItemBatch", "'" + orderDetl.getBatch() + "'");
+ if (!Cools.isEmpty()) content.put("proType", "'" + orderDetl.getProType() + "'");
+ if (!Cools.isEmpty()) content.put("remark", "'" + orderDetl.getMemo() + "'");
+ if (!Cools.isEmpty()) content.put("OrderNo", "'" + orderDetl.getOutOrderNo() + "'");
+ if (!Cools.isEmpty()) content.put("MainNum", orderDetl.getQty());
+ if (!Cools.isEmpty()) content.put("WareId", "'" + orderDetl.getWareId() + "'");
+ if (!Cools.isEmpty()) content.put("WareName", "'" + orderDetl.getWareName() + "'");
+ if (!Cools.isEmpty()) content.put("Packing", "'" + orderDetl.getPacking() + "'");
+ if (!Cools.isEmpty()) content.put("LuHao", "'" + orderDetl.getLuHao() + "'");
+ if (!Cools.isEmpty()) content.put("sPgNO", "'" + orderDetl.getSPgNO() + "'");
+ if (!Cools.isEmpty()) content.put("temp1", "'" + orderDetl.getTemp1() + "'");
+ if (!Cools.isEmpty()) content.put("temp2", "'" + orderDetl.getTemp2() + "'");
+ if (!Cools.isEmpty()) content.put("temp3", "'" + orderDetl.getTemp3() + "'");
+ if (!Cools.isEmpty()) content.put("LKName", "'涓壃浜屾湡'");
return content;
}
}
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 7e84fb4..cac5835 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -41,6 +41,11 @@
<result column="memo" property="memo" />
<result column="move_status" property="moveStatus" />
+ <result column="temp1" property="temp1" />
+ <result column="temp2" property="temp2" />
+ <result column="temp3" property="temp3" />
+ <result column="ware_id" property="wareId" />
+ <result column="ware_name" property="wareName" />
</resultMap>
<update id="updateSettle">
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index 5562fb9..67659ed 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -206,6 +206,10 @@
#btn-into {
display: none;
}
+#btn-export{
+ margin-right: 45px;
+}
+
/*淇敼澶嶉�夋棰滆壊*/
/*.layui-form-checked[lay-skin=primary] i {*/
--
Gitblit v1.9.1