From 5f6dbe95bb56f30ccd7acb98282d486e5ed2afd8 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 26 六月 2025 17:33:39 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locMast/locMast.html | 2
src/main/java/com/zy/asrs/controller/LocDetlController.java | 17 +++++---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 3 +
src/main/resources/mapper/LocDetlMapper.xml | 2 +
src/main/resources/mapper/LocMastMapper.xml | 3 -
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 2
src/main/java/com/zy/asrs/controller/MobileController.java | 13 ++++--
src/main/webapp/static/js/stoMan/stoQue.js | 1
src/main/java/com/zy/asrs/entity/LocDetl.java | 1
src/main/webapp/views/stoMan/stoQue.html | 9 ++++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 15 ++++---
src/main/webapp/static/js/locMast/locMast.js | 2
src/main/java/com/zy/asrs/entity/LocMast.java | 4 +-
src/main/java/com/zy/common/service/CommonService.java | 1
14 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 4a7c5f2..d5fff0b 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -255,12 +255,17 @@
// @ManagerAuth
public void statisExport(HttpServletResponse response) throws IOException {
List<LocDetl> excel = LocDetlMapper.getStockStatisExcel();
- for (LocDetl locDetl : excel) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
+// try{
+// for (LocDetl locDetl : excel) {
+// System.out.println(locDetl.getMatnr());
+// Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+// if (mat != null) {
+// locDetl.sync(mat);
+// }
+// }
+// }catch (Exception e){
+// e.printStackTrace();
+// }
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("搴撳瓨鏄庣粏缁熻鎶ヨ〃", "UTF-8");
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 9e27f88..c75a28d 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -18,6 +18,7 @@
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -28,6 +29,7 @@
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
* Created by vincent on 2020/6/10
*/
+@Slf4j
@RestController
@RequestMapping("mobile")
public class MobileController extends BaseController {
@@ -126,28 +128,31 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
+ public synchronized R comb(@RequestBody CombParam combParam){
+ log.info("comb,{}",JSONObject.toJSON(combParam));
mobileService.comb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@RequestMapping("/comb/auth2")
@ManagerAuth(memo = "缁勬墭")
- public R comb2(@RequestBody CombParam combParam){
+ public synchronized R comb2(@RequestBody CombParam combParam){
+ log.info("comb2,{}",JSONObject.toJSON(combParam));
mobileService.comb2(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@RequestMapping("/comb/auth3")
@ManagerAuth(memo = "缁勬墭")
- public R comb3(@RequestBody CombParam combParam){
+ public synchronized R comb3(@RequestBody CombParam combParam){
+ log.info("comb3,{}",JSONObject.toJSON(combParam));
mobileService.comb3(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@RequestMapping("/check/fullplt/auth")
@ManagerAuth(memo = "妫�娴嬬墿鏂欐槸鍚︽湁鏈弧鎵樻墭鐩�")
- public R checkFullplt(@RequestBody CombParam.CombMat combMat){
+ public R checkFullplt(@RequestBody CombParam.CombMat combMat){
List<LocMast> locMasts = mobileService.checkFullplt(combMat, getUserId());
return R.ok().add(locMasts);
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 6ded1d8..e5f1fb3 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -53,6 +53,7 @@
private String orderNo;
@ApiModelProperty(value= "瑙勬牸")
+ @ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value= "鍨嬪彿")
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..ab9ed9c 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -215,9 +215,9 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "閲嶅簱浣�";
case 2:
- return "楂樺簱浣�";
+ return "杞诲簱浣�";
default:
return String.valueOf(this.locType1);
}
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 1860cc7..038d47a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -114,8 +114,8 @@
}
HashMap<String,Object> cM=new HashMap<>();
for (CombParam.CombMat combMat : param.getCombMats()) {
- if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
- cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
+ if (cM.get(combMat.getMatnr())==null){
+ cM.put(combMat.getMatnr(),combMat);
}else {
throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
}
@@ -265,8 +265,8 @@
}
HashMap<String,Object> cM=new HashMap<>();
for (CombParam.CombMat combMat : param.getCombMats()) {
- if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
- cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
+ if (cM.get(combMat.getMatnr())==null){
+ cM.put(combMat.getMatnr(),combMat);
}else {
throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
}
@@ -437,8 +437,8 @@
}
HashMap<String,Object> cM=new HashMap<>();
for (CombParam.CombMat combMat : param.getCombMats()) {
- if (cM.get(combMat.getMatnr()+combMat.getBatch())==null){
- cM.put(combMat.getMatnr()+combMat.getBatch(),combMat);
+ if (cM.get(combMat.getMatnr())==null){
+ cM.put(combMat.getMatnr(),combMat);
}else {
throw new CoolException("缁勬墭鏁版嵁涓瓨鍦ㄩ噸澶嶇殑鏁版嵁===>>缂栫爜锛�" + combMat.getMatnr()+"鎵瑰彿锛�"+combMat.getBatch());
}
@@ -1346,6 +1346,9 @@
List<WrkDetl> wrkDetls = param.getWrkDetls();
for (WrkDetl wrkDetl : wrkDetls) {
+ if (wrkDetl.getAnfme()<=0){
+ continue;
+ }
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setZpallet(param.getBarcode());
wrkDetl.setMatnr("B"+wrkDetl.getMatnr());
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 5ba5226..ea987ff 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -43,7 +43,7 @@
}
}
- @Scheduled(cron = "0/1 * * * * ? ")
+ @Scheduled(cron = "0/50 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
if (!erpEnable) return;
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 9ad115f..3ab9557 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -183,6 +183,9 @@
return FAIL.setMsg("鎷ｆ枡鍏ュ簱 ===>> 淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
}
} else {
+ if (Math.abs(wrkDetl.getAnfme())<=0){
+ continue;
+ }
LocDetl detl = new LocDetl();
// Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d10d337..d6b86f6 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -198,6 +198,7 @@
}
}
if (Cools.isEmpty(locMast)) {
+ // sql涓婂幓鎺塺ow鎺掓潯浠�
locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
if (!locMastService.checkEmptyCount(locMast)) {
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 56a84b2..c6ccebc 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -250,6 +250,8 @@
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
+ , min(a.maktx) as maktx
+ , min(a.specs) as specs
, sum(a.anfme) as anfme
from asr_loc_detl a
where 1=1
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 2244412..45055b7 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -40,8 +40,7 @@
<select id="queryFreeLocMast" resultMap="BaseResultMap">
select top 1 *
from asr_loc_mast
- where row1=#{row}
- and loc_sts='O'
+ where loc_sts='O'
<if test="locType1 != null">
and loc_type1 = #{locType1}
</if>
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 54454f9..f72670d 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -54,7 +54,7 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
- ,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
+ ,{field: 'locType1$', align: 'center',title: '绫诲瀷'}
// ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
// ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index 76e6a1b..86e5d33 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -39,6 +39,7 @@
html += "disabled='disabled' >";
return html;
},width:80}
+ ,{field: 'locType1$', align: 'center',title: '绫诲瀷'}
,{field: 'barcode', align: 'center',title: '鏉＄爜鍙�'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
diff --git a/src/main/webapp/views/locMast/locMast.html b/src/main/webapp/views/locMast/locMast.html
index 6f4b17d..7ccc261 100644
--- a/src/main/webapp/views/locMast/locMast.html
+++ b/src/main/webapp/views/locMast/locMast.html
@@ -89,7 +89,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
-<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locMast/locMast.js?v=1" charset="utf-8"></script>
<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
<!-- 閲嶇疆搴撲綅寮圭獥 -->
diff --git a/src/main/webapp/views/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index aa87942..dd6ee7b 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -52,7 +52,14 @@
<div class="layui-input-inline">
<input class="layui-input" type="text" name="barcode" placeholder="鎵樼洏鐮�" autocomplete="off">
</div>
- </div>
+ </div> <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select name="loc_type1">
+ <option style="display: none"></option>
+ <option value="2">杞诲簱浣�</option>
+ <option value="1">閲嶅簱浣�</option>
+ </select>
+ </div></div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
--
Gitblit v1.9.1