From 6cc705d10d7d0366eb7aa4797acdf137e4b7576f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 26 五月 2023 16:36:38 +0800
Subject: [PATCH] #平库盘点完成
---
src/main/java/com/zy/asrs/controller/OrderCheckController.java | 132 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 131 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderCheckController.java b/src/main/java/com/zy/asrs/controller/OrderCheckController.java
index 7609be4..dec9af9 100644
--- a/src/main/java/com/zy/asrs/controller/OrderCheckController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderCheckController.java
@@ -12,6 +12,7 @@
import com.zy.asrs.entity.param.MatnrDto;
import com.zy.asrs.entity.param.OrderCheckParam;
import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
@@ -55,6 +56,9 @@
@Autowired
private ManLocDetlService manLocDetlService;
+
+ @Autowired
+ private LocCheckTrimService locCheckTrimService;
@RequestMapping(value = "/orderCheck/nav/list/auth")
@ManagerAuth
@@ -143,6 +147,9 @@
locCheck.setAnfme(manLocDetl.getAnfme());
locCheck.setRealAnfme(0.0);
locCheck.setDiffAnfme(0.0);
+ locCheck.setExamine(0);
+ locCheck.setOwner(manLocDetl.getOwner());
+ locCheck.setPayment(manLocDetl.getPayment());
locCheck.setCreateTime(now);
locCheck.setUpdateTime(now);
locCheck.setOrderNo(param.getOrderNo());
@@ -379,5 +386,128 @@
return R.ok();
}
+ @RequestMapping("/orderCheck/create/loc/auth")
+ @ManagerAuth
+ public R autolocCreate(@RequestBody CheckDTO checkDTO){
+ Double prec = Double.valueOf(checkDTO.getPrec());
+ List<CheckDTO.data> data = checkDTO.getData();
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
+ int count = manLocDetlService.selectCount(manLocDetlEntityWrapper);
+ List<ManLocDetl> countLocDetl = new ArrayList<>();
+ double precDpuble = prec / 100;
+ count = (int)(count * precDpuble);
+ if (checkDTO.getData() == null){
+ countLocDetl = locCheckService.getCountLocDetl(count);
+ }else {
+ for (CheckDTO.data a :data){
+ String locno = a.getValue();
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper2 = new EntityWrapper<>();
+ manLocDetlEntityWrapper2.eq("loc_no",locno);
+ int countfor = manLocDetlService.selectCount(manLocDetlEntityWrapper2);
+ countfor = (countfor * precDpuble)>1? Math.round((float)(countfor * precDpuble)) : 1 ;
+ for (ManLocDetl manLocDetl: locCheckService.getLocCountLocDetl(countfor,a.getValue())){
+ countLocDetl.add(manLocDetl);
+ }
+ }
+ }
-}
\ No newline at end of file
+ return R.ok().add(countLocDetl);
+ }
+
+ @RequestMapping("/orderCheck/create/owner/auth")
+ @ManagerAuth
+ public R autoOwnerlocCreate(@RequestBody CheckDTO checkDTO){
+ Double prec = Double.valueOf(checkDTO.getPrec());
+ List<CheckDTO.data> data = checkDTO.getData();
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
+ int count = manLocDetlService.selectCount(manLocDetlEntityWrapper);
+ List<ManLocDetl> countLocDetl = new ArrayList<>();
+ double precDpuble = prec / 100;
+ count = (int)(count * precDpuble);
+ if (checkDTO.getData() == null){
+ countLocDetl = locCheckService.getCountLocDetl(count);
+ }else {
+ for (CheckDTO.data a :data){
+ String owner = a.getValue();
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper2 = new EntityWrapper<>();
+ manLocDetlEntityWrapper2.eq("owner",owner);
+ int countfor = manLocDetlService.selectCount(manLocDetlEntityWrapper2);
+ countfor = (countfor * precDpuble)>1? Math.round((float)(countfor * precDpuble)) : 1 ;
+ for (ManLocDetl manLocDetl: locCheckService.getOwnerCountLocDetl(countfor,a.getValue())){
+ countLocDetl.add(manLocDetl);
+ }
+ }
+ }
+
+ return R.ok().add(countLocDetl);
+ }
+
+ @RequestMapping(value = "/orderCheck/mxamine")
+ public R mxamine(@RequestBody LocCheck locCheck){ //瀹℃牳
+ locCheck.setDiffAnfme(locCheck.getRealAnfme() - locCheck.getAnfme());
+ locCheck.setExamine(1);
+ locCheck.setType(2);
+ if (!locCheckService.updateById(locCheck)){
+ return R.error("鐘舵�佹洿鏂板け璐�");
+ }
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
+ manLocDetlEntityWrapper.eq("loc_no",locCheck.getLocNo());
+ manLocDetlEntityWrapper.eq("matnr",locCheck.getMatnr());
+ ManLocDetl manLocDetl = new ManLocDetl();
+ manLocDetl.setAnfme(locCheck.getRealAnfme());
+ if (!manLocDetlService.update(manLocDetl,manLocDetlEntityWrapper)){
+ return R.error("鏇存柊骞冲簱搴撳瓨澶辫触");
+ }
+
+ Date now = new Date();
+ Long userId = getUserId();
+ LocCheckTrim locCheckTrim = new LocCheckTrim();
+ locCheckTrim.setLocNo(locCheck.getLocNo());
+ locCheckTrim.setMaktx(locCheck.getMaktx());
+ locCheckTrim.setType(locCheck.getType());
+ locCheckTrim.setExamine(locCheck.getExamine());
+ locCheckTrim.setMatnr(locCheck.getMatnr());
+ locCheckTrim.setAnfme(locCheck.getAnfme());
+ locCheckTrim.setRealAnfme(locCheck.getRealAnfme());
+ locCheckTrim.setDiffAnfme(locCheck.getDiffAnfme());
+ locCheckTrim.setCreateTime(now);
+ locCheckTrim.setCreateBy(userId);
+ locCheckTrim.setOrderNo(locCheck.getOrderNo());
+ if (!locCheckTrimService.insert(locCheckTrim)){
+ return R.error("鍘嗗彶妗ｆ彃鍏ュけ璐�");
+ }
+
+
+
+ return R.ok("瀹℃牳瀹屾垚锛�");
+ }
+ @RequestMapping(value = "/orderCheck/all/get/loc")
+ public R mxamine(){
+ List<String> list = locCheckService.getLocCount();
+ List<KeyValueVo> keyValueVoList = new ArrayList<>();
+ for (int i=0;i<list.size();i++){
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(list.get(i));
+ vo.setValue(list.get(i));
+ keyValueVoList.add(vo);
+ }
+ return R.ok(keyValueVoList);
+
+ }
+
+ @RequestMapping(value = "/orderCheck/all/get/owner")
+ public R mxamineOwner(){
+ List<LocOwner> list = locCheckService.getOwnerCount();
+ List<KeyValueVo> keyValueVoList = new ArrayList<>();
+ for (LocOwner basLocOwner: list){
+ KeyValueVo vo = new KeyValueVo();
+ vo.setName(basLocOwner.getOwner());
+ vo.setValue(basLocOwner.getId());
+ keyValueVoList.add(vo);
+ }
+ return R.ok(keyValueVoList);
+
+ }
+
+
+}
--
Gitblit v1.9.1