From 02ee94b7bee4a00c04cfdc7735e310ec45bdea18 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 31 八月 2022 15:03:54 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/ManLocDetlMapper.xml | 17 ++++++++
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 1
src/main/java/com/zy/asrs/controller/NodeController.java | 17 ++++++++
src/main/resources/mapper/LocDetlMapper.xml | 1
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 ++++++
src/main/java/com/zy/asrs/entity/param/OffSaleParam.java | 13 ++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 10 ++++-
src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java | 5 ++
src/main/java/com/zy/asrs/service/MobileService.java | 6 +++
9 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index a59f8bb..70ddb33 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -11,6 +11,7 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.service.*;
import com.zy.common.model.LocDto;
@@ -55,13 +56,18 @@
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
- //@ManagerAuth
+ @ManagerAuth
public R matOnSale(@RequestBody CombParam combParam){
mobileService.onSale(combParam);
return R.ok("涓婃灦鎴愬姛");
}
// 鍟嗗搧涓嬫灦
-
+ @RequestMapping("/mat/offSale/auth")
+ //@ManagerAuth
+ public R matOffSale(@RequestBody OffSaleParam offSaleParam){
+ mobileService.offSale(offSaleParam);
+ return R.ok("涓嬫灦鎴愬姛");
+ }
// 缁勬墭 ----------------------------------------------------------------------------------------------------
/**
diff --git a/src/main/java/com/zy/asrs/controller/NodeController.java b/src/main/java/com/zy/asrs/controller/NodeController.java
index a55aa61..8d9aace 100644
--- a/src/main/java/com/zy/asrs/controller/NodeController.java
+++ b/src/main/java/com/zy/asrs/controller/NodeController.java
@@ -12,7 +12,10 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Node;
+import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.NodeService;
import com.zy.common.entity.NodeExcel;
import com.zy.common.entity.NodeExcelListener;
@@ -39,6 +42,8 @@
private NodeService nodeService;
@Autowired
private TreeUtils treeUtils;
+ @Autowired
+ private ManLocDetlMapper manLocDetlMapper;
@RequestMapping(value = "/node/{id}/auth")
@ManagerAuth
@@ -107,6 +112,10 @@
@RequestMapping(value = "/node/add/auth")
@ManagerAuth
public R add(Node node) {
+ Node node1 = nodeService.selectByUuid(node.getName());
+ if (!Cools.isEmpty(node1)) {
+ throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+ }
if (node.getType() != 1) {
Node parentNode = nodeService.selectById(node.getParentId());
if (parentNode == null || parentNode.getStatus() == 0) {
@@ -132,9 +141,15 @@
return R.ok();
}
+
+
@RequestMapping(value = "/node/update/auth")
@ManagerAuth
public R update(Node node){
+ Node node1 = nodeService.selectByUuid(node.getName());
+ if (!Cools.isEmpty(node1)) {
+ throw new CoolException("璇ョ紪鍙�/鍚嶇О宸插瓨鍦�");
+ }
if (Cools.isEmpty(node) || null==node.getId()){
return R.error();
}
@@ -151,7 +166,9 @@
nodeUtils.executePath(node);
node.setPath(nodeUtils.path.toString());
node.setNamePath(nodeUtils.pathName.toString());
+ node.setUuid(node.getName());
+ manLocDetlMapper.updateLocNo0(node.getId(),node.getName());
node.setUpdateBy(getUserId());
node.setUpdateTime(new Date());
nodeService.updateById(node);
diff --git a/src/main/java/com/zy/asrs/entity/param/OffSaleParam.java b/src/main/java/com/zy/asrs/entity/param/OffSaleParam.java
new file mode 100644
index 0000000..5c891d4
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OffSaleParam.java
@@ -0,0 +1,13 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+@Data
+public class OffSaleParam {
+
+ // 鐗╂枡缂栧彿
+ private String matnr;
+ // 搴撲綅缂栧彿
+ private String locNo;
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 53f9856..c33ab13 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -66,4 +66,5 @@
List<LocDetl> unreason();
Double selectLocDetlSumQty(String locNo);
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
index f53365d..03dc5a3 100644
--- a/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManLocDetlMapper.java
@@ -65,4 +65,9 @@
List<ManLocDetl> unreason();
Double selectLocDetlSumQty(String locNo);
+
+ int updateLocNo0(Long nodeId, String locNo);
+
+ List<ManLocDetl> selectLocNo0(String locNo, String matnr);
+ int deleteLocNo0(String locNo, String matnr);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 1dcc010..6172647 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -6,6 +6,7 @@
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.OffSaleParam;
import java.util.Date;
@@ -22,6 +23,11 @@
void onSale(CombParam param);
/**
+ * 涓嬫灦
+ */
+ void offSale(OffSaleParam param);
+
+ /**
* 鐩樼偣
*/
void adjust(MobileAdjustParam param, Long userId);
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 0e0df7e..2e8c7f3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -9,7 +9,9 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
+import com.zy.asrs.entity.param.OffSaleParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.common.CodeRes;
@@ -73,6 +75,8 @@
private NodeService nodeService;
@Autowired
private ManLocDetlService manLocDetlService;
+ @Autowired
+ private ManLocDetlMapper manLocDetlMapper;
@Override
@@ -224,6 +228,15 @@
}
@Override
+ public void offSale(OffSaleParam offSaleParam) {
+ List<ManLocDetl> manLocDetls = manLocDetlMapper.selectLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
+ if (Cools.isEmpty(manLocDetls)){
+ throw new CoolException("鍟嗗搧涓嬫灦澶辫触锛�");
+ }
+ int i = manLocDetlMapper.deleteLocNo0(offSaleParam.getLocNo(), offSaleParam.getMatnr());
+ System.out.println(i);
+ }
+ @Override
@Transactional
public void adjust(MobileAdjustParam param, Long userId) {
BasDevp basDevp = basDevpService.selectById(param.getStaNo());
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 3d1dedc..0869303 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -319,4 +319,5 @@
where loc_no=#{locNo}
</select>
+
</mapper>
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index bfa79c1..b246a85 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -219,4 +219,21 @@
</select>
<select id="selectLocDetlSumQty" resultType="java.lang.Double"></select>
+ <select id="selectLocNo0" resultType="com.zy.asrs.entity.ManLocDetl">
+ select * from man_loc_detl
+ where loc_no = #{locNo}
+ and matnr = #{matnr}
+ </select>
+
+
+ <update id="updateLocNo0">
+ update man_loc_detl set loc_no = #{locNo}
+ where node_id = #{nodeId}
+ </update>
+ <update id="deleteLocNo0">
+ delete from man_loc_detl
+ where loc_no = #{locNo}
+ and matnr = #{matnr}
+ </update>
+
</mapper>
--
Gitblit v1.9.1