From 2fcf73e5783a7a06dd4d4e6f412b9f759a7230c1 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 05 一月 2026 21:22:06 +0800
Subject: [PATCH] 调整出入库配置
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml | 6 --
fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java | 12 ++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java | 16 +++++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java | 10 +--
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 29 +++++----
fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml | 27 ++------
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java | 42 +++++++------
8 files changed, 79 insertions(+), 65 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java
index bff135a..a80cc9a 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/mapper/DepotConfMapper.java
@@ -1,8 +1,13 @@
package com.fzzy.igds.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fzzy.igds.domain.DepotConf;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
/**
* @Description
@@ -12,4 +17,15 @@
@Mapper
public interface DepotConfMapper extends BaseMapper<DepotConf> {
+
+ /**
+ * 鑷畾涔夊叧鑱旀煡璇QL
+ * 鍏宠仈鍚堝悓琛紝鏍规嵁閾惰id鏌ヨ搴撳尯閰嶇疆鍒楄〃
+ * @param queryWrapper 鏌ヨ鏉′欢
+ * @return 搴撳尯閰嶇疆鍒楄〃
+ */
+ @Select("SELECT DISTINCT d.* FROM d_pledge_contract c LEFT JOIN d_depot_conf d ON d.dept_id = c.pledge_dept ${ew.customSqlSegment}")
+ List<DepotConf> selectByBank(@Param("ew") QueryWrapper<DepotConf> queryWrapper);
+
+
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
index 752f946..c31f47b 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java
@@ -48,12 +48,12 @@
}
if (Constant.USER_TYPE_20.equals(user.getUserType())) {
//閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
- return this.getDeptByContract(user.getUserData());
+ return this.getDeptByBank(user.getUserData());
}
if (Constant.USER_TYPE_30.equals(user.getUserType())) {
//搴撳尯鐢ㄦ埛
String deptId = user.getDeptId() + "";
- if(deptId.length() > 7){
+ if(ContextUtil.isDepotUser(deptId)){
//鏌ヨ鐢ㄦ埛鎵�灞炲簱鍖�
return this.listDept(deptId,null,null);
}else {
@@ -66,15 +66,13 @@
/**
* 鏍规嵁閾惰id锛屽叧鑱斿悎鍚岃〃鏌ヨ搴撳尯鍒楄〃
- * @param bankId
+ * @param bankId 閾惰鍙�
* @return
*/
- public List<Dept> getDeptByContract(String bankId) {
-
+ public List<Dept> getDeptByBank(String bankId) {
if (StringUtils.isBlank(bankId)){
return null;
}
-
QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("c.pledge_bank", bankId);
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
index 255b959..67fa188 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotConfService.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.constant.RedisConst;
-import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.DepotConf;
import com.fzzy.igds.mapper.DepotConfMapper;
import com.fzzy.igds.utils.ContextUtil;
@@ -13,6 +12,7 @@
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,8 +32,6 @@
@Resource
private DepotConfMapper depotConfMapper;
@Resource
- private DepotService depotService;
- @Resource
private RedisCache redisCache;
/**
@@ -51,7 +49,7 @@
QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("company_id", companyId);
- if(StringUtils.isNotBlank(deptId)){
+ if (StringUtils.isNotBlank(deptId)) {
queryWrapper.eq("dept_id", deptId);
}
return depotConfMapper.selectList(queryWrapper);
@@ -66,30 +64,36 @@
SysUser user = ContextUtil.getLoginUser();
QueryWrapper<DepotConf> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("company_id", user.getCompanyId());
+
//鐩戠鐢ㄦ埛-榛樿鏌ョ湅鎵�鏈変俊鎭笉澧炲姞鏉′欢
if (Constant.USER_TYPE_10.equals(user.getUserType())) {
+ queryWrapper.eq("company_id", user.getCompanyId());
//涓嶅鍔犳潯浠�
+ }
+
+ //搴撳尯鐢ㄦ埛锛屽鏋滄槸鍏徃鐢ㄦ埛鍙互鏌ョ湅鍏徃涓嬪睘鎵�鏈夊簱鍖猴紝濡傛灉涓哄綋鍓嶅簱鍖哄彧鏌ヨ褰撳墠搴撳尯
+ if (Constant.USER_TYPE_30.equals(user.getUserType())) {
+ queryWrapper.eq("company_id", user.getCompanyId());
+
+ if (ContextUtil.isDepotUser(user.getDeptId() + "")) {
+ queryWrapper.eq("dept_id", user.getDeptId() + "");
+ } else {
+ queryWrapper.likeRight("dept_id", user.getDeptId() + "");
+ }
}
//閾惰鐢ㄦ埛锛屾牴鎹悎鍚屾煡璇㈤摱琛屼笅鎵�鏈夊簱鍖�
if (Constant.USER_TYPE_20.equals(user.getUserType())) {
- return this.getDeptByContract(user.getUserData());
+ if(StringUtils.isBlank(user.getUserData())) return null;
+
+ queryWrapper.eq("d.company_id", user.getCompanyId());
+ queryWrapper.eq("c.pledge_bank", user.getUserData());
+ return depotConfMapper.selectByBank(queryWrapper);
}
-
-
-
-
- return null;
- }
-
- private List<DepotConf> getDeptByContract(String userData) {
-
- //TODO
- return null;
+ return depotConfMapper.selectList(queryWrapper);
}
/**
@@ -112,7 +116,7 @@
conf.setUpdateBy(ContextUtil.getLoginUserName());
conf.setUpdateTime(new Date());
depotConfMapper.insert(conf);
- }else {
+ } else {
conf.setUpdateBy(ContextUtil.getLoginUserName());
conf.setUpdateTime(new Date());
depotConfMapper.update(conf, new UpdateWrapper<DepotConf>().eq("depot_id", conf.getDepotId()));
@@ -127,7 +131,7 @@
* @return
*/
public void deleteDepotConf(DepotConf conf) {
- depotConfMapper.deleteById( conf);
+ depotConfMapper.deleteById(conf);
//鍒犻櫎閰嶇疆缂撳瓨
this.delCacheDepotConf(conf, conf.getCompanyId());
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
index 1174e36..60cd2f6 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/utils/ContextUtil.java
@@ -180,6 +180,18 @@
}
+ /**
+ * 濡傛灉鐢ㄦ埛鏄簱鍖虹敤鎴凤紝鍒ゆ柇鏄惁鏁版嵁鍏徃绾у埆
+ *
+ * @param userDeptId 褰撳墠鐢ㄦ埛閮ㄩ棬ID
+ * @return 濡傛灉閮ㄩ棬ID澶т簬闀垮害7璇存槑鏄簱鍖猴紝鍚﹀垯灏辨槸鍏徃绾у埆
+ */
+ public static boolean isDepotUser(String userDeptId) {
+ if(StringUtils.isBlank(userDeptId)) return false;
+ return userDeptId.length() > 7;
+ }
+
+
public static void main(String[] args) {
for (int i = 0; i < 10; i++){
String id = generateId();
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
index 04ef0e6..4bc359d 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ConfByDept.view.xml
@@ -132,11 +132,7 @@
</DataType>
</Model>
<View layout="padding:10">
- <ClientEvent name="onReady">
-
-/**
-* 鍑哄叆搴撻厤缃�
-*/
+ <ClientEvent name="onReady">//鍑哄叆搴撻厤缃�
inoutConf = function(){
var cur = view.get("#dgMain").get("selection");
if(cur){
@@ -147,10 +143,8 @@
$notify("璇峰厛閫夋嫨搴撳尯鈥︹��");
}
};
-
-/**
-* 鎶撴媿閰嶇疆
-*/
+
+// 鎶撴媿閰嶇疆
snapConf = function(){
var cur = view.get("#dgMain").get("selection");
if(cur){
@@ -163,9 +157,7 @@
}
};
-/**
-* 宸℃閰嶇疆
-*/
+//宸℃閰嶇疆
patrolConf = function(){
var cur = view.get("#dgMain").get("selection");
if(cur){
@@ -175,11 +167,9 @@
}else{
$notify("璇峰厛閫夋嫨搴撳尯鈥︹��");
}
-};
+};
-/**
-* 宸ュ崟閰嶇疆
-*/
+//宸ュ崟閰嶇疆
workOrderConf = function(){
var cur = view.get("#dgMain").get("selection");
if(cur){
@@ -191,9 +181,7 @@
}
};
-/**
-* 娴佸獟浣撻厤缃�
-*/
+//娴佸獟浣撻厤缃�
cameraMediaConf = function(){
var cur = view.get("#dgMain").get("selection");
if(cur){
@@ -204,7 +192,6 @@
$notify("璇峰厛閫夋嫨搴撳尯鈥︹��");
}
};
-
//鎿嶄綔
renderCell1 = function(arg,self){
var data = arg.data;
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
index 91cd547..bc1f867 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -48,6 +48,8 @@
}
/**
+ *
+ * TODO 褰撳墠鏂规硶鍙栨秷锛岄�昏緫璋冩暣涓哄湪鎻愪氦鏃跺�欓獙璇佹槸鍚︽槸閾惰鐩戠浠擄紝榛樿鑾峰彇鐩稿簲鐨勫垪琛�
* depotPR#getDataByBankId
*
* @return
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
index 5245c0d..18035e8 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeIn.view.xml
@@ -222,12 +222,6 @@
<Property name="loadMode">manual</Property>
<Property name="dataType">dtNoticeParam</Property>
</DataSet>
- <DataSet id="dsDepotList">
- <Property name="dataProvider">depotPR#getDataByBankId</Property>
- <Property name="userData">浠撳簱鍒楄〃涓嬫媺妗�</Property>
- <Property name="loadMode">manual</Property>
- <Property name="dataType">[dtDepot]</Property>
- </DataSet>
<Container>
<Property name="className">c-param</Property>
<AutoForm>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index 863267b..8940d47 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -9,18 +9,19 @@
<Property></Property>
<Property name="label">閫氱煡鍗曞彿</Property>
</PropertyDef>
- <PropertyDef name="companyId">
- <Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
<Property name="mapping">
<Property name="keyProperty">id</Property>
- <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
<Property name="valueProperty">kqmc</Property>
</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
@@ -57,7 +58,7 @@
<Property></Property>
<Property name="label">鍑哄簱浠撳簱</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getDeptByUserType").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -72,11 +73,6 @@
<Property></Property>
<Property name="label">鍙戣揣鍗曚綅</Property>
<Property name="required">false</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">kqmc</Property>
- </Property>
</PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
@@ -90,7 +86,7 @@
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
- <Property name="label">骞翠唤</Property>
+ <Property name="label">绮骞翠唤</Property>
</PropertyDef>
<PropertyDef name="targetNumber">
<Property name="dataType">double</Property>
@@ -329,7 +325,7 @@
<Fill/>
</ToolBar>
<DataGrid id="dataGridMain" layoutConstraint="padding:8">
- <ClientEvent name="onDataRowDoubleClick">view.get("#dataGridMain").set("selection",arg.data);</ClientEvent>
+ <ClientEvent name="onDataRowClick">self.set("selection",arg.data);</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<Property name="selectionMode">singleRow</Property>
@@ -475,6 +471,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
<Editor/>
@@ -490,7 +491,7 @@
<Property name="trigger">defaultYearDropDown</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">customerName</Property>
<Property name="property">customerName</Property>
<Editor/>
--
Gitblit v1.9.3