From 87b9fcdce2b5459b54498d9b21c66031d06c5e5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 27 五月 2021 15:12:58 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/index.html | 6 +++---
src/main/java/zy/cloud/wms/common/service/erp/ErpService.java | 3 ---
src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java | 4 ++--
src/main/webapp/views/index.html | 1 -
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 8 +++++---
src/main/java/zy/cloud/wms/common/web/BaseController.java | 2 +-
6 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index 64acc73..02fdaf5 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -550,7 +550,7 @@
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
- getOrderResult0.setVchType(11); // todo:luxiaotao
+ getOrderResult0.setVchType(11);
getOrderResult0.setBillDate(order.getOrderTime());
getOrderResult0.setBTypeID(order.getTel());
getOrderResult0.setKTypeID("瀹忔尯浠撳簱");
@@ -628,7 +628,7 @@
// 澶�
getOrderResult0.setNumber(order.getOrderNo());
- getOrderResult0.setVchType(6); // todo:luxiaotao
+ getOrderResult0.setVchType(6);
getOrderResult0.setBillDate(order.getOrderTime());
getOrderResult0.setBTypeID(order.getTel());
getOrderResult0.setKTypeID("瀹忔尯浠撳簱");
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
index 454d4d0..a33e517 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
@@ -34,9 +34,6 @@
* 鍗曟嵁涓婃姤
*/
public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
- if (true) {
-// return true;
- }
try {
if (Cools.isEmpty(dtos)) {
return false;
diff --git a/src/main/java/zy/cloud/wms/common/web/BaseController.java b/src/main/java/zy/cloud/wms/common/web/BaseController.java
index 1bb099b..0769880 100644
--- a/src/main/java/zy/cloud/wms/common/web/BaseController.java
+++ b/src/main/java/zy/cloud/wms/common/web/BaseController.java
@@ -91,7 +91,7 @@
map.put("pageNumber", pageNumber);
map.put("pageSize", pageSize);
- // 鍏ㄥ瓧娈垫ā绯婃悳绱� todo
+ // 鍏ㄥ瓧娈垫ā绯婃悳绱�
if (!Cools.isEmpty(map.get("condition"))) {
Set<String> columns = new HashSet<>();
for (Field field : Cools.getAllFields(cls)){
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 8ebcfdf..2b7e6f3 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -816,9 +816,11 @@
String docNum = null;
Long docId = null;
switch (check.getSettle()) {
- case 1: // 鐩樼泩
- docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
- docId = 14L; // 鎶ユ孩鍗�
+ case 1: // 鐩樼泩 todo 鍓嶆湡鐢ㄩ噰璐崟涓婃姤
+// docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+// docId = 14L; // 鎶ユ孩鍗�
+ docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
+ docId = 34L; // 閲囪喘鍗�
break;
case 2: // 鐩樹簭
docNum = "CD-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index b602645..f99afd9 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -26,7 +26,6 @@
font-weight: bold
}
- /*todo:luxiaotao*/
.layui-layout-admin .layui-logo {
letter-spacing: 2px;
font-size: 22px;
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 9d10855..85e86cd 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -25,7 +25,7 @@
/* 瀵艰埅 */
.nav {
- background-color: #fff; /*todo*/
+ background-color: #fff;
color: #000;
list-style-type: none;
position: fixed;
@@ -35,7 +35,7 @@
}
.nav li {
float: left;
- border-right: 1px solid #f1f1f1; /*todo*/
+ border-right: 1px solid #f1f1f1;
}
.nav li a {
font-size: 20px;
@@ -55,7 +55,7 @@
color: #666;
}
.nav-select {
- background-color: #f1f1f1; /*todo*/
+ background-color: #f1f1f1;
color: #000;
}
--
Gitblit v1.9.1