From 6e8c80e42a05b46553b9b267fcdd23b8abb94cc2 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 05 十二月 2022 11:28:59 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 23 ++++++++++++++---------
src/main/webapp/static/js/adjDetl/adjDetl.js | 2 +-
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 94b07ff..c227b76 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -12,15 +12,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.ManLocDetl;
-import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.LocDetlMapper;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.ManLocDetlService;
-import com.zy.asrs.service.MatService;
+import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -37,6 +31,8 @@
private LocDetlService locDetlService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private AdjDetlService adjDetlService;
@Autowired
private LocDetlMapper locDetlMapper;
@@ -187,6 +183,13 @@
locDetlEnd = locDetlService.selectOne(new EntityWrapper<LocDetl>()
.eq("loc_no",locDetl.getLocNo()).eq("matnr",locDetl.getMatnr()).eq("batch",locDetl.getSku()));
}
+ AdjDetl adjDetlSource = new AdjDetl(locDetl.getLocNo(),locDetl.getMatnr(),locDetl.getBatch(),null,locDetlSource.getAnfme(),null,null,locDetlSource.getAnfme()-locDetl.getAnfme(),null,"淇敼鍚堝悓鍙�:"+locDetl.getBatch()+"鈫�"+locDetl.getSku(),getUserId(),new Date(),getUserId(),new Date());
+ AdjDetl adjDetlEnd=null;
+ if (Cools.isEmpty(locDetlEnd)){
+ adjDetlEnd = new AdjDetl(locDetl.getLocNo(),locDetl.getMatnr(),locDetl.getSku(),null,0.0,null,null,locDetl.getAnfme(),null,"淇敼鍚堝悓鍙�:"+locDetl.getBatch()+"鈫�"+locDetl.getSku(),getUserId(),new Date(),getUserId(),new Date());
+ }else {
+ adjDetlEnd = new AdjDetl(locDetl.getLocNo(),locDetl.getMatnr(),locDetl.getSku(),null,locDetlEnd.getAnfme(),null,null,locDetlEnd.getAnfme()+locDetl.getAnfme(),null,"淇敼鍚堝悓鍙�:"+locDetl.getBatch()+"鈫�"+locDetl.getSku(),getUserId(),new Date(),getUserId(),new Date());
+ }
if (locDetlSource.getAnfme()-locDetl.getAnfme()==0){
if (Cools.isEmpty(locDetlEnd)){
locDetlSource.setBatch(locDetl.getSku());
@@ -219,8 +222,10 @@
}else {
return R.error("杈撳叆鏁伴噺鏈夎锛岃瑙勮寖鎿嶄綔锛侊紒锛�");
}
+ adjDetlService.insert(adjDetlSource);
+ adjDetlService.insert(adjDetlEnd);
}catch (Exception e){
- return R.error("寮傚父");
+ return R.error("寮傚父锛侊紒锛佽瑙勮寖鎿嶄綔锛侊紒锛�");
}
return new R(201,"鍚堝悓鍙蜂慨鏀规垚鍔燂紝璇峰埛鏂伴〉闈紒锛侊紒");
}
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index cf5c1f8..3db8a2b 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -30,7 +30,7 @@
// ,{field: 'adjCtns', align: 'center',title: '鍙樻洿绠辨暟'}
,{field: 'adjQty', align: 'center',title: '鍙樻洿鏁伴噺'}
// ,{field: 'adjWt', align: 'center',title: '鍙樻洿閲嶉噺'}
- ,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞',width:300 ,hide:false}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'appeUser', align: 'center',title: '鍒涘缓鑰�'}
--
Gitblit v1.9.1