From d1b031c864041c0c75e433bcd839aa9493f506bb Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期日, 20 十月 2024 11:11:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 20 ++++-----
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 58 ++++++++++++++++-------------
src/main/java/com/zy/asrs/controller/MobileController.java | 22 +++++++++++
3 files changed, 63 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index b436325..99d9852 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -61,6 +61,28 @@
@Autowired
private CommonService commonService;
+ @RequestMapping("/select/workDetl/barcode")
+ @ManagerAuth
+ public R selectWorkDetlBarcode(@RequestBody Map<String,Object> map) {
+ String barcode = map.get("barcode").toString();
+ if (Cools.isEmpty(barcode)) {
+ return R.error("鏉＄爜涓虹┖");
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
+ if (Cools.isEmpty(wrkMast)) {
+ return R.error("鏈壘鍒颁换鍔�");
+ }
+ if (wrkMast.getWrkSts() != 14 && wrkMast.getIoType() != 103) {
+ return R.error("浠诲姟鐘舵�佹湁璇�");
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ if (Cools.isEmpty(wrkDetls)) {
+ return R.error("宸ヤ綔鏄庣粏鏈夎");
+ }
+ return R.ok(wrkDetls);
+
+ }
+
@RequestMapping("/leftovers/out")
@ManagerAuth
public R leftoversOut(@RequestBody Map<String,Object> map) {
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 3a6ac32..ee0c3ed 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -37,6 +37,7 @@
@RequestMapping(value = "/staDesc/init/auth")
@ManagerAuth(memo = "鍒濆鍖栫珯鐐硅矾寰�")
public R init(StaDescInitParam param) {
+ SqlSession sqlSession = null;
try{
if (param.getTypeDesc()==1){
staDescService.delete(new EntityWrapper<>());
@@ -44,7 +45,7 @@
String[] startStaList = param.getStartStaList().split(";");
String[] endStaList = param.getEndStaList().split(";");
List<StaDesc> staDescList = new ArrayList<>();
- SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
+ sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);
StaDescMapper sqlSessionMapper = sqlSession.getMapper(StaDescMapper.class);
for (String startSta : startStaList){
for (String endSta : endStaList){
@@ -66,22 +67,19 @@
staDesc.setModiTime(new Date());
staDesc.setAppeUser(getUserId());
staDesc.setAppeTime(new Date());
-// staDescList.add(staDesc);
sqlSessionMapper.insert(staDesc);
-
+// staDescList.add(staDesc);
}
}
}
- try{
- sqlSession.commit();
- sqlSession.close();
- }catch (Exception e){
- log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯�===>sql寮傚父锛歿}",e.getMessage());
- }
+ sqlSession.flushStatements();
+ sqlSession.clearCache();
+
// staDescService.insertBatch(staDescList);
}catch (Exception e){
- log.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細{}",e.getMessage());
- return R.error("鍒濆鍖栫珯鐐硅矾寰勫紓甯革細"+e.getMessage());
+ return R.error(e.getMessage());
+ }finally {
+ sqlSession.close();
}
return R.ok("ok1").add("ok2");
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 8ac0a91..26be866 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -568,38 +568,44 @@
@Override
// @Transactional
public void leftoversOut(Map<String, Object> map,Long userId) {
-
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", map.get("barcode")).eq("io_type", 103));
+ String barcode = map.get("barcode").toString();
+ String barcode2 = map.get("barcode2").toString();
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode).eq("io_type", 103));
if (Cools.isEmpty(wrkMast)) {
throw new CoolException("鏈煡璇㈠埌鎷ｆ枡浠诲姟");
}
- Date now = new Date();
int workNo = commonService.getWorkNo(1);
- WrkMast wrkMast1 = new WrkMast();
- wrkMast1.sync(wrkMast);
- wrkMast1.setWrkNo(workNo);
- wrkMast1.setWrkSts(2L);
- wrkMast1.setIoType(200);
- wrkMast1.setSourceStaNo(wrkMast.getStaNo() == 113 ? 111 : 117);
- wrkMast1.setStaNo(map.get("floor").hashCode() == 2 ? 204:304);
- wrkMast1.setIoTime(now);
- wrkMast1.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast1.setCrnNo(wrkMast.getCrnNo());
- wrkMast1.setSourceLocNo(wrkMast.getLocNo()); // 婧愬簱浣�
- wrkMast1.setFullPlt("Y"); // 婊℃澘锛歒
- wrkMast1.setPicking("N"); // 鎷ｆ枡
- wrkMast1.setExitMk("N"); // 閫�鍑�
- wrkMast1.setEmptyMk("N"); // 绌烘澘
- wrkMast1.setLinkMis("N");
- wrkMast1.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
- wrkMast1.setAppeTime(now);
- wrkMast1.setModiUser(userId);
- wrkMast1.setModiTime(now);
- wrkMast1.setBarcode(wrkMast.getBarcode());
- if (!wrkMastService.insert(wrkMast1)) {
- throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode2).eq("io_type", 200));
+ if (Cools.isEmpty(wrkMast2)) {
+ Date now = new Date();
+
+ WrkMast wrkMast1 = new WrkMast();
+ wrkMast1.sync(wrkMast);
+ wrkMast1.setWrkNo(workNo);
+ wrkMast1.setWrkSts(2L);
+ wrkMast1.setIoType(200);
+ wrkMast1.setSourceStaNo(wrkMast.getStaNo() == 113 ? 111 : 117);
+ wrkMast1.setStaNo(wrkMast.getStaNo() == 113 ? 204 : 304);
+ wrkMast1.setIoTime(now);
+ wrkMast1.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast1.setCrnNo(wrkMast.getCrnNo());
+ wrkMast1.setSourceLocNo(wrkMast.getLocNo()); // 婧愬簱浣�
+ wrkMast1.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast1.setPicking("N"); // 鎷ｆ枡
+ wrkMast1.setExitMk("N"); // 閫�鍑�
+ wrkMast1.setEmptyMk("N"); // 绌烘澘
+ wrkMast1.setLinkMis("N");
+ wrkMast1.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast1.setAppeTime(now);
+ wrkMast1.setModiUser(userId);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setBarcode(barcode2);
+ if (!wrkMastService.insert(wrkMast1)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
}
+
List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("zpallet", map.get("barcode")));
if (Cools.isEmpty(wrkDetls)) {
throw new CoolException("鏈煡璇㈠埌鎷ｆ枡浠诲姟鏄庣粏");
--
Gitblit v1.9.1