From ca2a6d455604056ce628f296911f6abac85a7598 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 09:54:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
.gitignore | 1
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/nc/entity/NccSaleDbddWms.java | 7 +
src/main/java/com/zy/common/config/AdminInterceptor.java | 4
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 8 +
src/main/webapp/static/js/wrkMast/wrkMast.js | 2
src/main/webapp/views/order/order.html | 3
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 10 +-
src/main/webapp/views/report/viewWorkOut.html | 15 ++-
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2
src/main/java/com/zy/nc/task/PlanOrderTask.java | 15 ++
src/main/webapp/static/js/user/user.js | 2
src/main/java/com/zy/common/service/CommonService.java | 4
src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml | 3
license.lic | 0
src/main/resources/config.properties | 6
src/main/java/com/zy/system/controller/UserController.java | 3
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/asrs/controller/LocDetlController.java | 14 ++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 6
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 16 +++
src/main/java/com/zy/asrs/entity/WrkMast.java | 5
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 5
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 9 +
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 2
src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 78 ++++++++++-----
src/main/resources/mapper/asrs/OrderPakinMapper.xml | 4
src/main/webapp/views/report/viewWorkIn.html | 15 ++-
src/main/java/com/zy/asrs/controller/MobileController.java | 1
src/main/java/com/zy/nc/entity/NccQilibcTmprintWms.java | 5 +
src/main/resources/mapper/asrs/LocDetlMapper.xml | 7 +
src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java | 23 +++-
src/main/webapp/static/js/orderPakout/out.js | 1
src/main/resources/mapper/asrs/ViewWorkInMapper.xml | 3
src/main/webapp/views/user/user.html | 6 +
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 4
src/main/resources/mapper/nc/NccQilibcTmprintWmsMapper.xml | 1
src/main/resources/mapper/asrs/OrderMapper.xml | 2
src/main/resources/license.lic | 0
src/main/resources/application.yml | 4
40 files changed, 225 insertions(+), 75 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9224005..2a2d42c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
### LOG ###
stock
LOG_PATH_IS_UNDEFINED
+license.lic
\ No newline at end of file
diff --git a/license.lic b/license.lic
index d98be0a..b50bae6 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index b664a1f..bf07b1f 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -379,9 +379,13 @@
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
+ Double weight = locDetl.getWeight();
+ String standby1 = locDetl.getStandby1();
Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
locDetl.sync(mat);
+ locDetl.setStandby1(standby1);
+ locDetl.setWeight(weight);
}
}
return R.ok().add(stockStatis);
@@ -420,4 +424,14 @@
return R.ok(sum);
}
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/count2")
+ public R getAllCount2(){
+ Integer sum = locDetlService.sum2();
+ return R.ok(sum);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index bff7c10..7f84853 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -290,6 +290,7 @@
matParam.setAnfme(0.0D);
matParam.setAnfme2(0.0D);
matParam.setTiaoma(nccQilibcTmprintWms.getBarcode());
+ matParam.setStandby1(nccQilibcTmprintWms.getCkbm());
return R.ok().add(matParam);
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 83298e9..6f35eb9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -446,7 +446,10 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
+ if(Cools.isEmpty(user.getNickname())){
+ return String.valueOf(user.getUsername());
+ }
+ return String.valueOf(user.getNickname());
}
return null;
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 77b7e24..6073321 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -463,7 +463,10 @@
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
if (!Cools.isEmpty(user)){
- return String.valueOf(user.getUsername());
+ if(Cools.isEmpty(user.getNickname())){
+ return String.valueOf(user.getUsername());
+ }
+ return String.valueOf(user.getNickname());
}
return null;
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 82eedd7..2f134ba 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -87,6 +87,8 @@
Integer sum();
+ Integer sum2();
+
List<LocDetl> unreason();
Double selectLocDetlSumQty(String locNo);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 2bdc4f2..0d0651e 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -76,6 +76,8 @@
Integer sum();
+ Integer sum2();
+
List<LocDetl> unreason();
Double getLocDetlSumQty(String locNo);
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 a793146..4b1695a 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -152,6 +152,15 @@
return this.baseMapper.sum();
}
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @Override
+ public Integer sum2() {
+ return this.baseMapper.sum2();
+ }
+
@Override
public List<LocDetl> unreason() {
return this.baseMapper.unreason();
diff --git a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
index 01df1fa..4c21f9d 100644
--- a/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ReportToThirdServiceImpl.java
@@ -86,6 +86,8 @@
Object process2 = null;
String memo = order.getMemo();
String remark = "";
+ boolean success = false;
+ log.info("璁㈠崟寮�濮嬩笂鎶�:{}", JSON.toJSONString(order));
try {
switch (order.getDocType$().toString()) {
case "閿�鍞��璐�":
@@ -95,6 +97,7 @@
if (!Cools.isEmpty(response) && response.isSuccess()) {
log.info("閿�鍞彂璐esponse:{}", response);
step = 10;
+ success = true;
} else {
remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
}
@@ -106,6 +109,7 @@
if (!Cools.isEmpty(response) && response.isSuccess()) {
log.info("閿�鍞彂璐esponse:{}", response);
step = 10;
+ success = true;
} else {
remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
}
@@ -117,6 +121,7 @@
if (!Cools.isEmpty(response) && response.isSuccess()) {
log.info("杞簱-鍏ュ簱response:{}", response);
step = 10;
+ success = true;
} else {
remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
}
@@ -146,6 +151,7 @@
if (!Cools.isEmpty(response) && response.isSuccess()) {
log.info("杞簱-鍑哄簱2response:{}", response);
step = 10;
+ success = true;
} else {
remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
}
@@ -168,6 +174,7 @@
if (!Cools.isEmpty(response) && response.isSuccess()) {
log.info("杞簱-鍑哄簱2response:{}", response);
step = 10;
+ success = true;
} else {
remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
}
@@ -181,6 +188,7 @@
if (!Cools.isEmpty(response) && response.isSuccess()) {
log.info("闆嗗洟鍐呴儴璋冩嫧response:{}", response);
step = 10;
+ success = true;
} else {
remark = response.getMessage() + "--" + response.getErrorStack().substring(0, 100);
}
@@ -203,7 +211,7 @@
e.printStackTrace();
throw new CoolException("璋冪敤鎺ュ彛鎶ラ敊锛岃鑱旂郴绠＄悊鍛�");
} finally {
- reportApiLog(response, order.getDocType$(), nyncIp, saveRefDelivery);
+ reportApiLog(order, process1, process2, response, order.getDocType$(), nyncIp, saveRefDelivery, success);
}
}
@@ -580,16 +588,19 @@
}
- private Boolean reportApiLog(Object data, String docType, String url, String path) {
- String response = "";
- boolean success = false;
+ private Boolean reportApiLog(Order order, Object process1, Object process2, Object response, String docType, String url, String path, Boolean success) {
+ HashMap<String, Object> request = new HashMap<>();
+ request.put("order", order);
+ request.put("process1", process1);
+ request.put("process2", process2);
+
apiLogService.save(
docType,
url + path,
null,
"127.0.0.1",
- JSON.toJSONString(data),
- response,
+ JSON.toJSONString(request),
+ JSON.toJSONString(response),
success
);
return false;
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 988ca1f..51050ca 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -85,7 +85,7 @@
log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
}
} catch (Exception e) {
- log.error(e.getMessage());
+ e.printStackTrace();
log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index d750f3e..6c9b312 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -7,6 +7,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.MathUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.common.model.DetlDto;
@@ -97,6 +98,7 @@
for (OrderDetl detail : orderDetls) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getBrand(), detail.getStandby1(), detail.getStandby2(), detail.getStandby3(), detail.getBoxType1(), detail.getBoxType2(), detail.getBoxType3(), detail.getAnfme());
+ dto.setOrderNo(detail.getOrderNo());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert detlDto != null;
@@ -105,6 +107,8 @@
OrderDetl orderDetl = OrderDetl.find(orderDetlList, dto.getMatnr(), dto.getBatch(), dto.getBrand(), dto.getStandby1(), dto.getStandby2(), dto.getStandby3(), dto.getBoxType1(), dto.getBoxType2(), dto.getBoxType3());
assert orderDetl != null;
orderDetl.setAnfme(MathUtils.add(orderDetl.getAnfme(), detail.getAnfme()));
+ Double weight = MatUtils.calcWeight(orderDetl.getMatnr(), orderDetl.getAnfme());
+ orderDetl.setWeight(weight);
} else {
list.add(dto);
orderDetlList.add(detail);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 409a033..1f98462 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -111,7 +111,7 @@
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
+ if (!locDetlService.updateAnfme(locDetl.getAnfme() + wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -343,7 +343,7 @@
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
+ if (!locDetlService.updateAnfme(locDetl.getAnfme() + wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
// exceptionHandle("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[matnr={1}]", wrkMast.getWrkNo(), wrkDetl.getMatnr());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("骞舵澘鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -406,7 +406,7 @@
for (WrkDetl wrkDetl : wrkDetls57) {
LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3());
if (null != locDetl) {
- if (!locDetlService.updateAnfme(wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
+ if (!locDetlService.updateAnfme(locDetl.getAnfme() + wrkDetl.getAnfme(), wrkMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getBrand(), wrkDetl.getStandby1(), wrkDetl.getStandby2(), wrkDetl.getStandby3(), wrkDetl.getBoxType1(), wrkDetl.getBoxType2(), wrkDetl.getBoxType3())) {
// exceptionHandle("鐩樼偣鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 鏇存柊搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
diff --git a/src/main/java/com/zy/common/config/AdminInterceptor.java b/src/main/java/com/zy/common/config/AdminInterceptor.java
index 547ba96..86e580b 100644
--- a/src/main/java/com/zy/common/config/AdminInterceptor.java
+++ b/src/main/java/com/zy/common/config/AdminInterceptor.java
@@ -119,8 +119,8 @@
User user = userService.selectById(userLogin.getUserId());
// String deToken = Cools.deTokn(token, user.getPassword());
// long timestamp = Long.parseLong(deToken.substring(0, 13));
- // 15鍒嗛挓鍚庤繃鏈�
- if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 900000){
+ // 24灏忔椂鍚庤繃鏈�
+ if (System.currentTimeMillis() - userLogin.getCreateTime().getTime() > 86400000){
Http.response(response, BaseRes.DENIED);
return false;
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bc3d255..87de7d8 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -231,7 +231,7 @@
//灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
crnNo = 1;
if (basCrnpService.checkSiteError(crnNo, true)) {
- List<Integer> nearRowList = new ArrayList<Integer>(){{add(3);add(4);add(1);add(6);}};
+ List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
for (Integer near : nearRowList) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", near)
@@ -298,7 +298,7 @@
.eq("crn_no", locMast1.getCrnNo())
.eq("bay1", locMast1.getBay1())
.notIn("loc_sts", "O")
- .orderBy("row1", true)
+ .orderBy("row1", false)
);
if (locMastList.isEmpty()) {
locMast = locMast1;
diff --git a/src/main/java/com/zy/nc/entity/NccQilibcTmprintWms.java b/src/main/java/com/zy/nc/entity/NccQilibcTmprintWms.java
index ea55235..d54c268 100644
--- a/src/main/java/com/zy/nc/entity/NccQilibcTmprintWms.java
+++ b/src/main/java/com/zy/nc/entity/NccQilibcTmprintWms.java
@@ -56,4 +56,9 @@
*/
private BigDecimal nastnum;
+ /**
+ *
+ */
+ private String ckbm;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java b/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
index e721c5f..77e3553 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleDbddWms.java
@@ -14,9 +14,14 @@
@Data
public class NccSaleDbddWms {
/**
- *
+ *
*/
@TableId
+ private String cbill_bid;
+
+ /**
+ *
+ */
private String cbillid;
/**
diff --git a/src/main/java/com/zy/nc/task/PlanOrderTask.java b/src/main/java/com/zy/nc/task/PlanOrderTask.java
index 43cace7..3d7868f 100644
--- a/src/main/java/com/zy/nc/task/PlanOrderTask.java
+++ b/src/main/java/com/zy/nc/task/PlanOrderTask.java
@@ -46,12 +46,19 @@
*/
@Scheduled(cron = "0/3 * * * * ? ")
public void execute1() {
- List<String> ids = storeTypeService.listOwn();
- List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(ids);
+ List<String> warehouseIds = storeTypeService.listOwn();
+ List<String> Ids = nccSaleXsfhmxWmsService.selectXsfh(warehouseIds);
for (String id : Ids) {
- List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>().eq("vbillcode", id).ne("wms_flag", 1).eq("fstatusflag", 2).eq("hdr", 0).eq("bdr", 0));
+ List<NccSaleXsfhmxWms> wmsFlag = nccSaleXsfhmxWmsService.selectList(new EntityWrapper<NccSaleXsfhmxWms>()
+ .eq("vbillcode", id)
+ .ne("wms_flag", 1)
+ .eq("fstatusflag", 2)
+ .eq("hdr", 0)
+ .eq("bdr", 0)
+ .in("fhckbm",warehouseIds)
+ );
if (wmsFlag == null || wmsFlag.isEmpty()) {
- return;
+ continue;
}
ReturnT<String> returnT = planOrderHandler.start1(wmsFlag);
if (!returnT.isSuccess()) {
diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
index f9308c4..04efe68 100644
--- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
+++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java
@@ -8,10 +8,7 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
-import com.zy.asrs.service.InventoryCheckOrderDetlService;
-import com.zy.asrs.service.InventoryCheckOrderService;
-import com.zy.asrs.service.MatService;
-import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.model.DetlDto;
@@ -58,6 +55,8 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private StoreTypeService storeTypeService;
/**
* 鍙戣揣
@@ -67,9 +66,14 @@
@Transactional
public ReturnT<String> start1(List<NccSaleXsfhmxWms> wmsFlag) {
try {
+ List<String> ids = storeTypeService.listOwn();
HashMap<String, List<NccSaleXsfhmxWms>> map = new HashMap<>();
List<NccSaleXsfhmxWms> fenzu;
for (NccSaleXsfhmxWms wms : wmsFlag) {
+ if(!ids.contains(wms.getFhckbm())){
+ continue;
+ }
+
if (map.get(wms.getFhckbm()) == null) {
fenzu = new ArrayList<>();
fenzu.add(wms);
@@ -321,28 +325,52 @@
@Transactional
public ReturnT<String> start5(List<NccSaleDbddWms> wmsFlag) {
try {
- OpenOrderPakoutParam param = new OpenOrderPakoutParam();
- param.setOrderType("闆嗗洟鍐呴儴璋冩嫧");
- DetlDto detlDto;
- List<DetlDto> orderDetails = new ArrayList<>();
- long i = 1;
- for (NccSaleDbddWms nccCgCgdhdWms : wmsFlag) {
- log.info("nccCgCgdhdWms鏁版嵁:{}", JSONObject.toJSON(nccCgCgdhdWms));
- detlDto = new DetlDto();
- detlDto.setMatnr(nccCgCgdhdWms.getWlbm());
- detlDto.setAnfme(nccCgCgdhdWms.getZsl().doubleValue());
- detlDto.setWeight(nccCgCgdhdWms.getFsl().doubleValue());
- detlDto.setBatch(nccCgCgdhdWms.getVbatchcode());
- detlDto.setLineNumber(i);
- detlDto.setRemark(JSONObject.toJSONString(nccCgCgdhdWms));
- orderDetails.add(detlDto);
- i++;
- nccCgCgdhdWms.setWmsFlag(1);
- param.setOrderNo(nccCgCgdhdWms.getVbillcode());
+ List<String> ids = storeTypeService.listOwn();
+ HashMap<String, List<NccSaleDbddWms>> map = new HashMap<>();
+ List<NccSaleDbddWms> fenzu;
+ for (NccSaleDbddWms wms : wmsFlag) {
+ if(!ids.contains(wms.getDcckbm())){
+ continue;
+ }
+
+ if (map.get(wms.getDcckbm()) == null) {
+ fenzu = new ArrayList<>();
+ fenzu.add(wms);
+ map.put(wms.getDcckbm(), fenzu);
+ } else {
+ fenzu = map.get(wms.getDcckbm());
+ fenzu.add(wms);
+ map.put(wms.getDcckbm(), fenzu);
+ }
}
- param.setOrderDetails(orderDetails);
- openService.pakoutOrderCreate(param);
- nccSaleDbddWmsService.updateBatchById(wmsFlag);
+ int size = 1;
+ for (String key : map.keySet()) {
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ param.setOrderType("闆嗗洟鍐呴儴璋冩嫧");
+ DetlDto detlDto;
+ List<DetlDto> orderDetails = new ArrayList<>();
+ long i = 1;
+ for (NccSaleDbddWms nccSaleDbddWms : map.get(key)) {
+ log.info("nccSaleDbddWms鏁版嵁:{}", JSONObject.toJSON(nccSaleDbddWms));
+ detlDto = new DetlDto();
+ detlDto.setMatnr(nccSaleDbddWms.getWlbm());
+ detlDto.setAnfme(nccSaleDbddWms.getZsl().doubleValue());
+ detlDto.setWeight(nccSaleDbddWms.getFsl().doubleValue());
+ detlDto.setBatch(nccSaleDbddWms.getVbatchcode());
+ detlDto.setLineNumber(i);
+ detlDto.setRemark(JSONObject.toJSONString(nccSaleDbddWms));
+ detlDto.setStandby1(nccSaleDbddWms.getDcckbm());
+ orderDetails.add(detlDto);
+ i++;
+ param.setOrderNo(nccSaleDbddWms.getVbillcode() + "-" + size);
+ param.setCstmrName(nccSaleDbddWms.getDrkczzmc());
+ nccSaleDbddWms.setWmsFlag(1);
+ }
+ param.setOrderDetails(orderDetails);
+ openService.pakoutOrderCreate(param);
+ nccSaleDbddWmsService.updateBatchById(map.get(key));
+ size++;
+ }
} catch (Exception e) {
e.printStackTrace();
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index c0c4e4b..3306946 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -120,6 +120,9 @@
if(user.getRoleId() != null) {
entity.setRoleId(user.getRoleId());
}
+ if(user.getNickname()!=null) {
+ entity.setNickname(user.getNickname());
+ }
userService.updateById(entity);
return R.ok();
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9c42cc1..1994a1f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -86,8 +86,8 @@
# 鐢ㄥ弸NC瀵规帴
NYNC:
- ip: http://192.168.5.200
- port: 1105
+ ip: http://192.168.5.160
+ port: 8088
pageSize: 1000
#1.閿�鍞嚭搴撳崟鍙傜収鍙戣揣鍗曟柊澧�
saveRefDelivery: /nccloud/api/ic/saleout/saveRefDelivery
diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
index 9569026..2772d50 100644
--- a/src/main/resources/config.properties
+++ b/src/main/resources/config.properties
@@ -1,7 +1,7 @@
#####涓嶅彉鍙傛暟
client_id=WMS
-client_secret=b5ee040e00584e518c06
-pubKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhxRFEtPfreu+ROWtC5IQZVy1Vkkqi0Fk7A4tGvyfLIw2qPNLWrTmCJeJwXLmgiB+EU0RW9U8jFYRAhSKaQY1HTjHMZcXdfH6m7WitT+sIyDVfTO3wVWtvjFBF1o6qi+T7pNsmCjstArnm/OS55kn0zJcRiTTwP1UU1LrkQbytf9ZHOcbKfqjIL8amsinjdxd6ioUM3JT3PpOXCIRDHsQgvAnFx2q7Y902S0PFzc40FwtuwsuKqesvEbIImUcq1wbIDtMegixy+TfJMWcByNLp2iv8/+Zos+hePhfWRPlD2x0vk30xDXMiUVgq0dhxC5C3yeD2QEbLxIlDqK2WebzZQIDAQAB
+client_secret=748378be87a94b7889b0
+pubKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAn4uBKrgJ2TZ4frpUtjuKMKggZu/FFeT2rvu5o0UWKmNCuwlOBQdWItqEV3qFIO+pWI7JMDT400sGrZSZtnGkU5LzmF70HuE1a0WSaOH/2fJyb7JnK/3dVpPx5MOL3vfXCq0eq/iSbXwi9aB0wgp9toh0vgK0S5I+xI9OhnN3k4EuLjCJ55wGPgyYMcCuDW4+FqZBfI5s2NDg7h4Q+zjsqWgAAMM/kw4oKQOzmgBOiiWPmMVOkzt9h4Y7/+uIghFUHf0jHqVvC/AwysAIszdmYY8llUtscIuw+w9pxVAcmwcFI/Ky+xUEKouwPI1SM0D2oe6fcA3+/Co4xuiuhwhNTwIDAQAB
secret_level=L0
#autotest=ture
@@ -18,7 +18,7 @@
## 鏈嶅姟鍣ㄥ湴鍧�
#baseUrl=http://10.16.7.160:9088
#baseUrl=http://10.10.4.166:9080
-baseUrl=http://192.168.5.200:1105
+baseUrl=http://192.168.5.160:8088
#baseUrl=http://192.168.61.18:21322
#baseUrl=https://ncc.yyncc.com
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index d98be0a..b50bae6 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index 553c959..4eace42 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -386,11 +386,13 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, a.batch
+ , a.standby1
, sum(a.anfme) as anfme
+ , sum(a.weight) as weight
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr, a.batch
+ group by a.matnr, a.batch , a.standby1
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -588,6 +590,9 @@
<select id="sum" resultType="java.lang.Integer">
SELECT SUM(anfme) FROM asr_loc_detl
</select>
+ <select id="sum2" resultType="java.lang.Integer">
+ SELECT SUM(weight) FROM asr_loc_detl
+ </select>
<select id="unreason" resultMap="BaseResultMap">
SELECT
*
diff --git a/src/main/resources/mapper/asrs/OrderMapper.xml b/src/main/resources/mapper/asrs/OrderMapper.xml
index 44448b8..87e7e9a 100644
--- a/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -71,7 +71,7 @@
</update>
<select id="selectComplete" resultMap="BaseResultMap">
- select top 5 *
+ select top 100 *
from man_order
where 1=1
and settle = 4
diff --git a/src/main/resources/mapper/asrs/OrderPakinMapper.xml b/src/main/resources/mapper/asrs/OrderPakinMapper.xml
index cd82c6c..4924d65 100644
--- a/src/main/resources/mapper/asrs/OrderPakinMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderPakinMapper.xml
@@ -56,7 +56,7 @@
</update>
<select id="selectComplete" resultMap="BaseResultMap">
- select top 5 *
+ select top 100 *
from man_order_pakin
where 1=1
and settle = 4
@@ -65,7 +65,7 @@
</select>
<select id="selectComplete8" resultMap="BaseResultMap">
- select top 5 *
+ select top 100 *
from man_order_pakin
where 1=1
and settle = 8
diff --git a/src/main/resources/mapper/asrs/ViewWorkInMapper.xml b/src/main/resources/mapper/asrs/ViewWorkInMapper.xml
index 0f5d0cd..a595e2f 100644
--- a/src/main/resources/mapper/asrs/ViewWorkInMapper.xml
+++ b/src/main/resources/mapper/asrs/ViewWorkInMapper.xml
@@ -14,6 +14,9 @@
<if test="anfme != null and anfme != ''">
and anfme = #{anfme}
</if>
+ <if test="order_no != null and order_no != ''">
+ and order_no like '%' + #{order_no} + '%'
+ </if>
<!-- <if test="maktx!=null and maktx!='' ">-->
<!-- and (maktx like '%' + #{maktx} + '%'-->
<!-- or matnr like '%' + #{maktx} + '%'-->
diff --git a/src/main/resources/mapper/nc/NccQilibcTmprintWmsMapper.xml b/src/main/resources/mapper/nc/NccQilibcTmprintWmsMapper.xml
index 30748aa..192e01d 100644
--- a/src/main/resources/mapper/nc/NccQilibcTmprintWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccQilibcTmprintWmsMapper.xml
@@ -14,6 +14,7 @@
<result property="asnnum" column="ASNNUM" />
<result property="pkMaterial" column="PK_MATERIAL" />
<result property="nastnum" column="NASTNUM" />
+ <result property="ckbm" column="ckbm" />
</resultMap>
</mapper>
diff --git a/src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml b/src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml
index 1caf61b..893ba1b 100644
--- a/src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml
+++ b/src/main/resources/mapper/nc/NccSaleDbddWmsMapper.xml
@@ -5,7 +5,8 @@
<mapper namespace="com.zy.nc.mapper.NccSaleDbddWmsMapper">
<resultMap id="BaseResultMap" type="com.zy.nc.entity.NccSaleDbddWms">
- <id property="cbillid" column="CBILLID" />
+ <id property="cbill_bid" column="CBILL_BID" />
+ <result property="cbillid" column="CBILLID" />
<result property="vbillcode" column="VBILLCODE" />
<result property="dbilldate" column="DBILLDATE" />
<result property="taudittime" column="TAUDITTIME" />
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index fd1da33..a9703d9 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -3,8 +3,9 @@
var cols = [
{field: 'anfme', align: 'center',title: '搴撳瓨鏁伴噺', style: 'font-weight: bold'}
];
- arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
+ arrRemove(detlCols, "field", "orderNo")
+ arrRemove(detlCols, "field", "supp")
cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
@@ -72,6 +73,19 @@
}
});
+ /**
+ * 鏄剧ず搴撳瓨鎬绘暟閲�
+ */
+ $.ajax({
+ url: baseUrl+"/locDetl/count2",
+ headers: {'token': localStorage.getItem('token')},
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ $("#countNum2").text(res.data + '涓�');
+ }
+ });
+
}
});
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index 559a8a9..e00930d 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/out.js
@@ -32,6 +32,7 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
+ ,{field: 'standby1$', align: 'center',title: '鍑哄簱浠撳簱', width: 160}
,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '鎵规'}
diff --git a/src/main/webapp/static/js/user/user.js b/src/main/webapp/static/js/user/user.js
index 0e06c7e..dfc5871 100644
--- a/src/main/webapp/static/js/user/user.js
+++ b/src/main/webapp/static/js/user/user.js
@@ -24,7 +24,7 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'hostName', align: 'center',title: '鎺堟潈鍟嗘埛', templet: '#hostTpl', width: 140}
- // ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
+ ,{field: 'nickname', align: 'center',title: '鐢ㄦ埛鍚�'}
,{field: 'username', align: 'center',title: '鐧诲綍璐︽埛'}
,{field: 'mobile', align: 'center',title: '鎵嬫満鍙�'}
// ,{field: 'deptName', align: 'center',title: '鎵�灞為儴闂�'}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index fe33064..5cf36ca 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -55,7 +55,7 @@
// ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'refIotime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiUser$', align: 'center',title: '鎿嶄綔浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true, width: 160}
// ,{field: 'memo', align: 'center',title: '澶囨敞'}
//
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index e637bfa..5fb0f81 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -55,7 +55,7 @@
// ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
// ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
// ,{field: 'plcStrTime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
+ ,{field: 'modiUser$', align: 'center',title: '鎿嶄綔浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index a312e9c..e249819 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -34,6 +34,14 @@
</div>
</fieldset>
</div>
+ <div class="layui-inline">
+ <fieldset class="layui-elem-field">
+ <legend>鎬昏杈呮暟閲�</legend>
+ <div class="layui-field-box" id="countNum2">
+ 璇风◢绛�
+ </div>
+ </fieldset>
+ </div>
</div>
<!-- 琛ㄦ牸 -->
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index aaa9ffe..f6fb615 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -107,6 +107,9 @@
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
{{# } }}
+ {{# if (d.settle == 4) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+ {{# } }}
</script>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="tbLook">
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 0636317..50f3b64 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -31,17 +31,22 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="order_no" placeholder="璁㈠崟缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="璐у搧鐗瑰緛" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 7e8a106..7284349 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -31,17 +31,22 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="order_no" placeholder="璁㈠崟缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="璐у搧鐗瑰緛" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index d2611c8..744be99 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -136,6 +136,12 @@
<input name="email" placeholder="璇疯緭鍏ラ偖绠�" class="layui-input">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input name="nickname" placeholder="璇疯緭鍏ュ悕绉�" class="layui-input">
+ </div>
+ </div>
</div>
</div>
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index d40678c..2072554 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -36,17 +36,17 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
<input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="zpallet" placeholder="鎵樼洏鐮�" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="璐у搧鐗瑰緛" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1