From 6d75b9bda39c710153183844ba1e8effbb730de1 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期二, 16 四月 2024 09:53:43 +0800
Subject: [PATCH] 单据、拣货单权限问题
---
src/main/java/com/zy/asrs/controller/ManPakOutController.java | 5 +++--
src/main/java/com/zy/asrs/controller/OrderController.java | 2 +-
src/main/webapp/static/js/picking/picking.js | 3 ++-
src/main/java/com/zy/asrs/controller/PlaController.java | 7 +++++--
src/main/resources/mapper/ManPakOutMapper.xml | 2 +-
src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java | 8 ++++----
src/main/java/com/zy/asrs/service/ManPakOutService.java | 4 ++--
src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java | 4 ++--
src/main/java/com/zy/asrs/controller/PakoutController.java | 9 +++++++++
src/main/resources/application.yml | 2 +-
10 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManPakOutController.java b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
index 5caf5ed..051f035 100644
--- a/src/main/java/com/zy/asrs/controller/ManPakOutController.java
+++ b/src/main/java/com/zy/asrs/controller/ManPakOutController.java
@@ -68,6 +68,7 @@
EntityWrapper<ManPakOut> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+
String docnum = String.valueOf(param.get("doc_num"));
if (Cools.isEmpty(docnum) || docnum.equals("null")) {
docnum = null;
@@ -80,7 +81,7 @@
etime = DateUtils.convert(dates[1]);
}
- List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit);
+ List<PakOutDTO> pakOutDTOS = manPakOutService.selectPakOut(docnum, stime, etime, curr, limit,getUserId());
for (PakOutDTO pakOutDTO:pakOutDTOS){
List<ManPakOut> manPakOuts = manPakOutService.selectList(new EntityWrapper<ManPakOut>().eq("doc_num", pakOutDTO.getDoc_num()));
for (ManPakOut manPakOut:manPakOuts){
@@ -95,7 +96,7 @@
}
- int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit);
+ int count = manPakOutService.selectPakOutCount(docnum, stime, etime,curr, limit,getUserId());
Page<PakOutDTO> page = new Page<>();
// 鏈�鍚庢寜鐘舵�佹湭鍑哄簱->宸插嚭搴撴帓搴�
// page.setRecords(pakOutDTOS.stream().sorted(Comparator.comparingInt(PakOutDTO::getStatus)).collect(Collectors.toList()));
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 2361c1f..bbcd4c8 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -92,7 +92,7 @@
excludeTrash(param);
// 闄愬埗閿�鍞鑹插彧鑳界湅鑷繁鍒涘缓鐨勫崟瀛愶紙閿�鍞鑹瞚d鍥哄畾21锛屼笉鑳介殢鎰忎慨鏀癸級
User user = getUser();
- if (user.getRoleId() == 21) {
+ if (user.getRoleId() != 2 && user.getRoleId() != 24) {
wrapper.eq("create_by", user.getId());
}
// 璁㈠崟琛ㄥ彧瀛樹簡鎿嶄綔浜篿d,鎵�浠ユ搷浣滀汉濮撳悕鏌ヨ锛屽彧鑳戒粠濮撳悕鍏堝幓鎵緄d锛�
diff --git a/src/main/java/com/zy/asrs/controller/PakoutController.java b/src/main/java/com/zy/asrs/controller/PakoutController.java
index 70eb979..aa021d7 100644
--- a/src/main/java/com/zy/asrs/controller/PakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/PakoutController.java
@@ -19,6 +19,7 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.service.PakoutService;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -52,6 +53,14 @@
EntityWrapper<Pakout> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+
+ User user = getUser();
+ if (user.getRoleId() != 2 || user.getRoleId() != 24) {
+ wrapper.eq("create_by", user.getId());
+ }
+
+
+
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(pakoutService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index da4ebed..ed652b4 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -171,7 +171,7 @@
plaService.updateById(pla);
plaQtyService.insert(plaQty);
//鐢熸垚鎷ｈ揣鍗�
- addPakOUT(plaQty);
+ addPakOUT(plaQty,getUserId());
};
@@ -354,7 +354,7 @@
}
}
- private R addPakOUT(PlaQty plaQty){
+ private R addPakOUT(PlaQty plaQty,Long userId){
ManPakOut manPakOut=new ManPakOut();
manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+System.currentTimeMillis());
manPakOut.setWrkSts((long)1);
@@ -372,6 +372,9 @@
manPakOut.setDocId(plaQty.getOrderDetlId());
manPakOut.setNodeId(plaQty.getId());
manPakOut.setCustName(plaQty.getCustomer());
+ manPakOut.setCreateBy(userId);
+ //棰勮鍙戣揣鏃堕棿
+ manPakOut.setSpecs(plaQty.getPakoutTime());
//manPakOut.setNodeId(plaQty.getOrderDetlId());
manPakOutService.insert(manPakOut);
return R.ok();
diff --git a/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java b/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
index 6d0300f..d38427a 100644
--- a/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ManPakOutMapper.java
@@ -16,7 +16,7 @@
- List<PakOutDTO> selectPakOut(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime, @Param("curr") Integer curr, @Param("limit") Integer limit);
+ List<PakOutDTO> selectPakOut(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime, @Param("curr") Integer curr, @Param("limit") Integer limit, @Param("userId") Long userId);
- int selectPakOutCount(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime,@Param("curr") Integer curr,@Param("limit") Integer limit);
+ int selectPakOutCount(@Param("docnum") String docnum,@Param("stime") Date stime, @Param("etime") Date etime,@Param("curr") Integer curr,@Param("limit") Integer limit, @Param("userId") Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/ManPakOutService.java b/src/main/java/com/zy/asrs/service/ManPakOutService.java
index a85206f..45743fa 100644
--- a/src/main/java/com/zy/asrs/service/ManPakOutService.java
+++ b/src/main/java/com/zy/asrs/service/ManPakOutService.java
@@ -8,7 +8,7 @@
import java.util.List;
public interface ManPakOutService extends IService<ManPakOut> {
- List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit);
+ List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId);
- int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit);
+ int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
index 69c197a..dc45a5a 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManPakOutServiceImpl.java
@@ -17,12 +17,12 @@
@Override
- public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit) {
- return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit);
+ public List<PakOutDTO> selectPakOut(String docnum, Date stime, Date etime, Integer curr, Integer limit, Long userId) {
+ return this.baseMapper.selectPakOut(docnum,stime,etime,curr,limit,userId);
}
@Override
- public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit) {
- return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit);
+ public int selectPakOutCount(String docnum, Date stime, Date etime,Integer curr, Integer limit, Long userId) {
+ return this.baseMapper.selectPakOutCount(docnum,stime, etime,curr,limit,userId);
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b5f1b80..6c8b1f9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://192.168.4.15:1433;databasename=hzjzwms
+# url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzhnewms
url: jdbc:sqlserver://127.0.0.1:1433;databasename=tzhnewms
username: sa
password: sa@123
diff --git a/src/main/resources/mapper/ManPakOutMapper.xml b/src/main/resources/mapper/ManPakOutMapper.xml
index 37b5a26..88af7a5 100644
--- a/src/main/resources/mapper/ManPakOutMapper.xml
+++ b/src/main/resources/mapper/ManPakOutMapper.xml
@@ -12,7 +12,7 @@
<if test="etime != null">
and create_time <= #{etime}
</if>
-
+ and (create_by = #{userId} or create_by is null)
</sql>
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 623d9e1..f0f0b3c 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -113,7 +113,7 @@
layer.open({
type: 1,
title: '鍗曟嵁鏄庣粏',
- area: '1200px',
+ area: '1500px',
offset: [top + 'px', (left - 450 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
@@ -146,6 +146,7 @@
,{field: 'count', align: 'center',title: '瀹屾垚鏁�'}
,{field: 'status$', align: 'center',title: '鐘舵��'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'specs', align: 'center',title: '鍙戣揣鏃堕棿'}
,{field: 'createBy', align: 'center',title: '', hide:true}
,{align: 'center', title: '鎿嶄綔', toolbar: '#operateDetl'}
]],
--
Gitblit v1.9.1