From 9268cd77b4e864b901a8b0bf965f441f2e8c4fbd Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 04 一月 2026 08:06:14 +0800
Subject: [PATCH] #1
---
src/main/webapp/views/pda/index.html | 4
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 3
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 136 ++++++++++++++-------------
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 4
src/main/resources/mapper/WrkMastMapper.xml | 2
src/main/webapp/views/pda/comb.html | 6
src/main/java/com/zy/common/web/WcsController.java | 26 ++++-
src/main/webapp/views/pda/matQuery.html | 29 +++--
src/main/webapp/static/js/locDetl/locDetl.js | 2
src/main/resources/mapper/WrkDetlMapper.xml | 1
src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java | 2
src/main/java/com/zy/asrs/entity/Mat.java | 4
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3
src/main/webapp/static/js/common.js | 6
src/main/java/com/zy/common/service/CommonService.java | 13 +-
src/main/resources/application.yml | 4
src/main/java/com/zy/asrs/service/WrkDetlService.java | 2
17 files changed, 139 insertions(+), 108 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index e77a43b..85ecf0d 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -135,10 +135,10 @@
private Double units;
/**
- * 鏉＄爜
+ * 鎵规鍙�
*/
@ApiModelProperty(value= "鏉＄爜")
- @ExcelProperty(value = "鏉＄爜")
+ @ExcelProperty(value = "鎵规鍙�")
private String barcode;
/**
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 307d06b..48bb83f 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -6,6 +6,7 @@
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+import java.util.Date;
import java.util.List;
@Mapper
@@ -26,5 +27,5 @@
List<WrkDetl> findByWorkNo(Integer workNo);
- boolean updateWorkNo(@Param("oldWrkNo") Integer oldWrkNo, @Param("newWrkNo") Integer newWrkNo);
+ boolean updateWorkNo(@Param("oldWrkNo") Integer oldWrkNo, @Param("newWrkNo") Integer newWrkNo, @Param("now") Date now);
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
index c229b41..5b7d414 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastLogMapper.java
@@ -13,4 +13,4 @@
@Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
int save(Integer workNo);
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index 4be4d8c..9277996 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -19,7 +19,7 @@
boolean updateInspect(Integer wrkNo, String matnr, String batch);
- boolean updateWorkNo(Integer oldWrkNo, Integer newWrkNo);
+ boolean updateWorkNo(Integer oldWrkNo, Integer newWrkNo,Date now);
List<WrkDetl> selectPakoutQuery(Integer staNo, String matnr);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 7ce1fe7..b3708fa 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -82,7 +82,7 @@
@Override
@Transactional
public void comb(CombParam param, Long userId) {
- if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
@@ -141,6 +141,7 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setBatch(mat.getBarcode()); //鎵规
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index ba252a4..89b4628 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -87,7 +87,7 @@
}
@Override
- public boolean updateWorkNo(Integer oldWrkNo, Integer newWrkNo) {
- return this.baseMapper.updateWorkNo(oldWrkNo, newWrkNo);
+ public boolean updateWorkNo(Integer oldWrkNo, Integer newWrkNo,Date now) {
+ return this.baseMapper.updateWorkNo(oldWrkNo, newWrkNo,now);
}
}
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 0e4e5b4..09452fd 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -139,7 +139,7 @@
// 淇敼搴撲綅鐘舵�� S ====>> F
if (locMast.getLocSts().equals("S")) {
locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
+// locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -160,16 +160,18 @@
}
for (WrkDetl wrkDetl : wrkDetls53) {
- LocDetl locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
- locDetl.setAnfme(wrkDetl.getPrice()-wrkDetl.getAnfme());//鏁伴噺
- locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- locDetl.setPrice(0.0);
- if (null != locDetl) {
- if (!locDetlService.insert(locDetl)) {
+ LocDetl locDetl1 = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+// LocDetl locDetl = new LocDetl();
+// locDetl.sync(wrkDetl);
+// locDetl.setAnfme(wrkDetl.getPrice()-wrkDetl.getAnfme());//鏁伴噺
+// locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+// locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+// locDetl.setModiTime(now);
+// locDetl.setAppeTime(now);
+// locDetl.setPrice(0.0);
+ if (null != locDetl1) {
+// if (!locDetlService.insert(locDetl)) {
+ if (!locDetlService.updateAnfme(locDetl1.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
@@ -195,9 +197,9 @@
}
// 淇敼搴撲綅鐘舵�� Q ====>> F
- if (locMast.getLocSts().equals("S")) {
+ if (locMast.getLocSts().equals("Q")) {
locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
+// locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -231,7 +233,7 @@
locDetl.sync(wrkDetl);
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+// locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
@@ -244,7 +246,7 @@
// 淇敼搴撲綅鐘舵�� Q ====>> F
if (locMast.getLocSts().equals("Q")) {
locMast.setLocSts("F");
- locMast.setBarcode(wrkMast.getBarcode());
+// locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -263,27 +265,29 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 宸ヤ綔鏄庣粏妗ｄ负绌�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
- for (WrkDetl wrkDetl:wrkDetls57){
- LocDetl locDetl = new LocDetl();
- locDetl.sync(wrkDetl);
- locDetl.setAnfme(wrkDetl.getAnfme());//鏁伴噺
- locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
- locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- locDetl.setModiTime(now);
- locDetl.setAppeTime(now);
- locDetl.setPrice(0.0);
- if (null != locDetl) {
- if (!locDetlService.insert(locDetl)) {
+// for (WrkDetl wrkDetl:wrkDetls57){
+// LocDetl locDetl1 = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+// LocDetl locDetl = new LocDetl();
+// locDetl.sync(wrkDetl);
+// locDetl.setAnfme(wrkDetl.getAnfme());//鏁伴噺
+// locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
+// locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
+// locDetl.setModiTime(now);
+// locDetl.setAppeTime(now);
+// locDetl.setPrice(0.0);
+// if (null != locDetl1) {
+// if (!locDetlService.insert(locDetl)) {
+// if (!locDetlService.updateAnfme(locDetl1.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
- }
- }
- }
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg("鐩樼偣鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
+// }
+// }
+// }
// 淇敼搴撲綅鐘舵�� S ====>> F
- if (locMast.getLocSts().equals("S")) {
- locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
- locMast.setBarcode(wrkMast.getBarcode());
+ if (locMast.getLocSts().equals("Q")) {
+ locMast.setLocSts("F");
+// locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -310,7 +314,7 @@
// 淇敼婧愬簱浣嶇姸鎬� ==> O
LocMast sourceLoc = locMastService.selectById(wrkMast.getSourceLocNo());
if (null != sourceLoc) {
- sourceLoc.setBarcode("");
+// sourceLoc.setBarcode("");
sourceLoc.setLocSts("O");
sourceLoc.setModiTime(now);
sourceLoc.setIoTime(now);
@@ -322,7 +326,7 @@
}
// 淇敼鐩爣搴撲綅鐘舵�� ==> .locSts
locMast.setLocSts(locSts);
- locMast.setBarcode(wrkMast.getBarcode());
+// locMast.setBarcode(wrkMast.getBarcode());
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -402,7 +406,7 @@
// 淇敼婧愬簱浣嶇姸鎬� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
- locMast.setBarcode("");
+// locMast.setBarcode("");
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
@@ -419,7 +423,7 @@
// 淇敼搴撲綅鐘舵�� R ===>> O
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
- locMast.setBarcode("");
+// locMast.setBarcode("");
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
@@ -434,34 +438,34 @@
//鎷ｆ枡鍜岀洏鐐瑰嚭搴�
case 103:
case 107:
- if (locMast.getLocSts().equals("P")) {
- locMast.setLocSts("O");
- locMast.setBarcode("");
- locMast.setModiTime(now);
- locMast.setIoTime(now);
- if (!locMastService.updateById(locMast)) {
-// exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡鍜岀洏鐐瑰嚭搴� ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- wrkMast.setWrkSts(16L);//绛夊緟鍏ュ簱
- // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
- if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- if(!wrkMast.getEmptyMk().equals("Y")) {
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
- exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
- }
- }
- // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
- if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
-// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
- TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg("鎷ｆ枡鐩樼偣鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
- }
- }
+// if (locMast.getLocSts().equals("P")) {
+// locMast.setLocSts("O");
+// locMast.setBarcode("");
+// locMast.setModiTime(now);
+// locMast.setIoTime(now);
+// if (!locMastService.updateById(locMast)) {
+//// exceptionHandle("绌烘澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐ワ紱[workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg("鎷ｆ枡鍜岀洏鐐瑰嚭搴� ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+// }
+// wrkMast.setWrkSts(14L);//绛夊緟鍏ュ簱
+// // 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
+// if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
+// exceptionHandle("淇濆瓨宸ヤ綔鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// if(!wrkMast.getEmptyMk().equals("Y")) {
+// // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+// if (!wrkDetlLogService.save(wrkMast.getWrkNo())) {
+// exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", wrkMast.getWrkNo());
+// }
+// }
+// // 鍒犻櫎宸ヤ綔妗ｆ簮搴撲綅鐨勫簱瀛樻槑缁�
+// if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {
+//// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触锛沎workNo={0}],[sourceLocNo={1}]", wrkMast.getWrkNo(), wrkMast.getSourceLocNo());
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+// return FAIL.setMsg("鎷ｆ枡鐩樼偣鍑哄簱 ===>> 鍒犻櫎搴撳瓨鏄庣粏澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
+// }
+// }
break;
default:
break;
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 282c5f1..313ed9c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -102,13 +102,13 @@
StartupDto startupDto = null;
StringBuilder builder = new StringBuilder();
try {
- startupDto = searchLocNoByCrnNo(staDescId, sourceStaNo, findLocNoAttributeVo, locTypeDto);
+ startupDto = searchLocNoByCrnNo(staDescId, sourceStaNo, findLocNoAttributeVo, locTypeDto,barcode);
} catch (Exception e) {
builder.append(e.getMessage()).append(",");
}
if(startupDto == null) {
- builder.append("鎵句笉鍒扮┖搴撲綅");
+ builder.append("鎵句笉鍒扮┖搴撲綅--->" + barcode);
throw new CoolException(builder.toString());
}
@@ -125,14 +125,17 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto searchLocNoByCrnNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+ public StartupDto searchLocNoByCrnNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto,String barcode) {
LocMast locMast = null;
if (staDescId == 10) {
//鎼滅储绌烘墭鐩�
- locMast = searchEmptyPallet(locTypeDto);
+// locMast = searchEmptyPallet(locTypeDto);
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("barcode",barcode));
+
}else {
//婊℃墭鐩�
- locMast = searchMaxPallet(findLocNoAttributeVo, locTypeDto);
+// locMast = searchMaxPallet(findLocNoAttributeVo, locTypeDto);
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().in("loc_sts","O","P").eq("barcode",barcode));
}
if(locMast == null) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 703bad5..5ec89eb 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -51,6 +51,10 @@
private LocDetlService locDetlService;
@Autowired
private BasCrnpService basCrnpService;
+ @Autowired
+ private WrkMastLogService wrkMastLogService;
+ @Autowired
+ private WrkDetlLogService wrkDetlLogService;
@Value("${led.ip}")
private String ledIp;
@@ -157,7 +161,7 @@
StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto, barcode);
if (dto == null) {
- throw new CoolException("鎵句笉鍒扮┖搴撲綅");
+ throw new CoolException("鎵句笉鍒扮┖搴撲綅--->" + barcode);
}
int workNo = dto.getWorkNo();
Date now = new Date();
@@ -237,7 +241,7 @@
throw new CoolException("鎷ｉ�夌洏鐐逛换鍔′笉瀛樺湪");
}
- if (wrkMastOut.getIoType() != 103 || wrkMastOut.getIoType() != 107) {
+ if (wrkMastOut.getIoType() != 103 && wrkMastOut.getIoType() != 107) {
throw new CoolException("浠诲姟绫诲瀷涓嶅睘浜庢嫞閫夈�佺洏鐐�");
}
@@ -277,12 +281,24 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+ wrkMast.setIoTime(now);
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
- wrkDetlService.updateWorkNo(wrkMastOut.getWrkNo(), workNo);
+ //淇濆瓨宸ヤ綔涓绘。
+ if (!wrkMastLogService.save(wrkMastOut.getWrkNo())){
+ throw new CoolException("淇濆瓨宸ヤ綔涓绘。澶辫触锛寃orkNo=" + wrkMastOut.getWrkNo());
+ }
+ //淇濆瓨宸ヤ綔鏄庣粏妗�
+ if (!wrkMastOut.getEmptyMk().equals("Y")) {
+ if (!wrkDetlLogService.save(wrkMastOut.getWrkNo())){
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触锛寃orkNo=" + wrkMastOut.getWrkNo());
+ }
+ }
+
+ wrkDetlService.updateWorkNo(wrkMastOut.getWrkNo(), workNo,now);
// 鍒犻櫎宸ヤ綔涓绘。
if (!wrkMastService.deleteById(wrkMastOut)) {
@@ -297,8 +313,8 @@
}
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(dto.getLocNo());
- if (locMast.getLocSts().equals("O")) {
- locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ if (locMast.getLocSts().equals("P")) {
+ locMast.setLocSts("Q"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a263d56..22c4679 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8081
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=shhtgcasrs
+ url: jdbc:sqlserver://127.0.0.1:52840;databasename=shhtgcasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index c448ed1..d483d58 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -85,6 +85,7 @@
update asr_wrk_detl
set wrk_no = #{newWrkNo}
, modi_time = getdate()
+ , io_time = #{now}
where 1=1
and wrk_no = #{oldWrkNo}
</update>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 44fd552..12b85b6 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -71,7 +71,7 @@
where wrk_sts=5
or wrk_sts=20
or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,8,modi_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,5,modi_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
or (wrk_sts=15 and modi_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
order by modi_time,wrk_no asc
</select>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 462607e..2ec9738 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -195,7 +195,7 @@
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ ,{field: 'barcode', align: 'center',title: '鎵规', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
@@ -225,10 +225,10 @@
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
+// ,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
-
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '鍥惧彿', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 0c4f93c..990c656 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -8,7 +8,7 @@
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+ ,{field: 'specs', align: 'center',title: '閰嶇疆',hide: true}
,{field: 'model', align: 'center',title: '鍥惧彿', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 4739ffb..13b9cb1 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -54,11 +54,11 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
+ {fixed: 'left', align: 'center', field: 'anfme', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
{field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
- done: function (res, curr, count) {
+ done: function (res, curr, anfme) {
}
});
@@ -100,7 +100,7 @@
let toPush = true;
for (var j=0;j<matData.length;j++){
if (data.matnr === matData[j].matnr) {
- matData[j].count = Number(matData[j].count) + Number(data.count);
+ matData[j].anfme = Number(matData[j].anfme) + Number(data.anfme);
toPush = false;
}
}
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 50ecb47..cd3c9db 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -74,8 +74,8 @@
<!-- 瀵艰埅鏍� -->
<ul class="nav">
<li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a></li>
- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>
- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>
+<!-- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>-->
+<!-- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>-->
</ul>
<!-- 涓讳綋鍐呭 -->
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 1c2b07b..5bfc1dc 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -78,19 +78,23 @@
<div class="form-box">
<div class="form-item">
<span>鍟嗗搧缂栧彿</span>
- <input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ <input id="matnr" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
</div>
<div class="form-item">
<span>鍟嗗搧鍚嶇О</span>
- <input id="matName" type="text" disabled="disabled">
+ <input id="maktx" type="text" disabled="disabled">
</div>
<div class="form-item">
- <span>瑙勬牸</span>
- <input id="str2" type="text" disabled="disabled">
+ <span>鍥惧彿</span>
+ <input id="model" type="text" disabled="disabled">
</div>
<div class="form-item">
<span>鍗曚綅</span>
- <input id="str1" type="text" disabled="disabled">
+ <input id="unit" type="text" disabled="disabled">
+ </div>
+ <div class="form-item">
+ <span>鎵规鍙�</span>
+ <input id="barcode" type="text" disabled="disabled">
</div>
<div class="form-item">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -124,9 +128,10 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- $('#matName').val(res.data.matName);
- $('#str1').val(res.data.str1);
- $('#str2').val(res.data.str2);
+ $('#maktx').val(res.data.maktx);
+ $('#model').val(res.data.model);
+ $('#unit').val(res.data.unit);
+ $('#barcode').val(res.data.barcode);
countDom.val(initMatCount);
$('#count').focus().select();
}
@@ -144,15 +149,15 @@
*/
function confirm(){
var data = {
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
- count: countDom.val()
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
+ anfme: countDom.val()
};
parent.addTableData(data);
parent.layer.close(parent.matCodeLayerIdx);
}
- window.onload = function(){document.getElementById("matNo").focus();}
+ window.onload = function(){document.getElementById("matnr").focus();}
$(document).on('click','#confirm', function () {
})
--
Gitblit v1.9.1