fzzy-igdss-core/src/main/java/com/fzzy/igds/service/EventInfoService.java
@@ -58,8 +58,11 @@ queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey()); } //抓拍时间检索 if (param.getStart() != null && param.getEnd() != null) { queryWrapper.between("time", param.getStart(), param.getEnd()); if (null != param.getStart()) { queryWrapper.ge("time", param.getStart()); } if (null != param.getEnd()) { queryWrapper.le("time", param.getEnd()); } //事件名称 if (StringUtils.isNotBlank(param.getName())) { fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SnapRecordService.java
@@ -54,8 +54,11 @@ queryWrapper.apply("dept_id IN (SELECT dept_id FROM sys_dept WHERE parent_id = {0})", param.getKey()); } //抓拍时间检索 if (param.getStart() != null && param.getEnd() != null) { queryWrapper.between("snap_time", param.getStart(), param.getEnd()); if (null != param.getStart()) { queryWrapper.ge("snap_time",param.getStart()); } if (null != param.getEnd()) { queryWrapper.le("snap_time", param.getEnd()); } //标签检索 if (StringUtils.isNotBlank(param.getName())) { fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
@@ -262,7 +262,8 @@ if (StringUtils.isNotBlank(param.getDeptId())) { depotStoreQueryWrapper.likeRight("dept_id", param.getDeptId()); } depotStoreQueryWrapper.between("create_time", param.getStart(), param.getEnd()); depotStoreQueryWrapper.ge("create_time", param.getStart()); depotStoreQueryWrapper.le("create_time", param.getEnd()); depotStoreQueryWrapper.orderByAsc("create_time"); return depotStoreMapper.selectList(depotStoreQueryWrapper); } @@ -276,7 +277,8 @@ if (StringUtils.isNotBlank(param.getDeptId())) { inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId()); } inoutRecordQueryWrapper.between("create_time", param.getStart(), param.getEnd()); inoutRecordQueryWrapper.ge("create_time", param.getStart()); inoutRecordQueryWrapper.le("create_time", param.getEnd()); inoutRecordQueryWrapper.orderByAsc("create_time"); return inoutRecordMapper.selectList(inoutRecordQueryWrapper); } @@ -290,7 +292,8 @@ if (StringUtils.isNotBlank(param.getDeptId())) { inoutStockChangeQueryWrapper.likeRight("dept_id", param.getDeptId()); } inoutStockChangeQueryWrapper.between("create_time", param.getStart(), param.getEnd()); inoutStockChangeQueryWrapper.ge("create_time", param.getStart()); inoutStockChangeQueryWrapper.le("create_time", param.getEnd()); inoutStockChangeQueryWrapper.orderByAsc("create_time"); return inoutStockChangeMapper.selectList(inoutStockChangeQueryWrapper); } @@ -304,7 +307,8 @@ if (StringUtils.isNotBlank(param.getDeptId())) { inoutLossOverQueryWrapper.likeRight("dept_id", param.getDeptId()); } inoutLossOverQueryWrapper.between("create_time", param.getStart(), param.getEnd()); inoutLossOverQueryWrapper.ge("create_time", param.getStart()); inoutLossOverQueryWrapper.le("create_time", param.getEnd()); inoutLossOverQueryWrapper.orderByAsc("create_time"); return inoutLossOverMapper.selectList(inoutLossOverQueryWrapper); } fzzy-igdss-view/src/main/java/com/fzzy/igds/Bank.view.xml
@@ -127,7 +127,6 @@ <Property name="caption">银行信息</Property> <Property name="closeable">false</Property> <Property name="iconClass">fa fa-tasks</Property> <Property name="height">50%</Property> <Buttons> <Button> <ClientEvent name="onClick">view.get("#saveAction").execute(function(){
 fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
@@ -206,6 +206,36 @@ </DataType> </Model> <View layout="padding:10"> <ClientEvent name="onReady">/**
 * 查看详情
 * @param {String/Number} manualId 手动传入的id值（可选）
 */
 detail = function(manualId){
 // 优先使用手动传入的id，没有则走原有选中行逻辑
 var id = manualId;
 if(!id){
 var cur = view.get("#dgMain").get("selection");
 if(cur){
 id = cur.get("id");
 }
 }
 
 // 有id则打开详情页，否则提示
 if(id){
 var url = "/com.fzzy.igds.Dept.d?parentId="+ id;
 window.$openTab("库区管理", url);
 }else{
 $notify("请先选择收储公司……");
 }
 };
 
 renderId = function(arg){
 var txt = arg.data.getText("id");
 if(!txt) return true;
 // 关键修改：点击时把txt作为参数传给detail方法（注意转义双引号）
 var htm = "<a href='javascript:;' onClick='detail(\""+txt+"\")' >"+txt+"</a>";
 arg.dom.innerHTML = htm;
 }</ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> <Property name="dataProvider">companyPR#getData</Property> @@ -243,6 +273,7 @@ <RowSelectorColumn/> <RowNumColumn/> <DataColumn name="id"> <ClientEvent name="onRenderCell">renderId(arg);</ClientEvent> <Property name="property">id</Property> <Property name="align">center</Property> <Property name="width">120</Property> @@ -297,7 +328,7 @@ <Property name="caption">收储公司信息</Property> <Property name="closeable">false</Property> <Property name="iconClass">fa fa-tasks</Property> <Property name="height">80%</Property> <Property name="height">90%</Property> <Buttons> <Button id="btnOk"> <ClientEvent name="onClick">view.get("#uaSave").execute(function(result){
 fzzy-igdss-view/src/main/java/com/fzzy/igds/Depot.view.xml
@@ -16,17 +16,44 @@ </DataType> </Model> <View layout="padding:10"> <ClientEvent name="onReady">
 <ClientEvent name="onReady">// start 通过库区id来加载仓储数据
 /**
 * 通用工具函数：获取URL中的指定参数值
 * @param {String} name 要获取的参数名
 * @returns {String/null} 参数值（无则返回null）
 */
 function getUrlParam(name) {
 // 解析URL的查询字符串（?后面的部分）
 var search = window.location.search.substring(1);
 // 分割成键值对数组
 var params = search.split("&");
 for (var i = 0; i < params.length; i++) {
 var pair = params[i].split("=");
 // 解码参数值（处理中文/特殊字符）
 if (decodeURIComponent(pair[0]) === name) {
 return decodeURIComponent(pair[1] || "");
 }
 }
 return null;
 }; 
 
 
 
 /**
 * 查询
 */
 query = function(){
 view.get("#dataSetdepot").flushAsync();
 }
</ClientEvent> //通过库区id来加载仓储数据
 var parentId = getUrlParam("parentId");
 view.get("#dataSetdepot").set("parameter",{parentId: parentId}).flushAsync();
 };
query();
 
 </ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dataSetdepot"> <Property name="dataProvider">depotPR#getData</Property> <Property name="dataType">[dtDepot]</Property> <Property name="loadMode">manual</Property> </DataSet> <DataSet id="dataSetUser"> <Property name="dataType">[dataTypeUser]</Property> @@ -155,7 +182,7 @@ <Property name="iconClass">fa fa-tasks</Property> <Property name="caption">仓库信息</Property> <Property name="width">80%</Property> <Property name="height">82%</Property> <Property name="height">90%</Property> <Property name="closeable">false</Property> <Buttons> <Button id="btnOK"> @@ -215,11 +242,11 @@ <Property name="property">deptId</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">storageMax</Property> <Property name="property">storageMax</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">storageMax</Property> <Property name="property">storageMax</Property> <Editor/> </AutoFormElement> <AutoFormElement layoutConstraint="colSpan:2"> <Property name="name">storeType</Property> <Property name="property">storeType</Property> fzzy-igdss-view/src/main/java/com/fzzy/igds/DepotPR.java
@@ -6,6 +6,7 @@ import com.fzzy.igds.domain.Depot; import com.fzzy.igds.service.DepotService; import com.fzzy.igds.utils.ContextUtil; import com.ruoyi.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -30,7 +31,10 @@ * @return */ @DataProvider public List<Depot> getData(){ public List<Depot> getData(String parentId){ if(StringUtils.isNotEmpty(parentId)){ return depotService.getData(null,parentId,false); } return depotService.getData(null, ContextUtil.subDeptId(null) ,false); }
@@ -149,10 +149,69 @@ view.get("#dialogImg").show();
 
 };</ClientEvent> <ClientEvent name="onReady">
 // start 通过收储公司id来加载库区数据
 /**
 * 通用工具函数：获取URL中的指定参数值
 * @param {String} name 要获取的参数名
 * @returns {String/null} 参数值（无则返回null）
 */
 function getUrlParam(name) {
 // 解析URL的查询字符串（?后面的部分）
 var search = window.location.search.substring(1);
 // 分割成键值对数组
 var params = search.split("&");
 for (var i = 0; i < params.length; i++) {
 var pair = params[i].split("=");
 // 解码参数值（处理中文/特殊字符）
 if (decodeURIComponent(pair[0]) === name) {
 return decodeURIComponent(pair[1] || "");
 }
 }
 return null;
 };
 
 var parentId = getUrlParam("parentId");
 console.log("parentId",parentId);
 view.get("#dsMain").set("parameter",{parentId: parentId}).flushAsync();
 //end 
 
 /**
 * 查看详情
 * @param {String/Number} manualId 手动传入的id值（可选）
 */
 detail = function(manualId){
 // 优先使用手动传入的id，没有则走原有选中行逻辑
 var id = manualId;
 if(!id){
 var cur = view.get("#dgMain").get("selection");
 if(cur){
 id = cur.get("id");
 }
 }
 
 // 有id则打开详情页，否则提示
 if(id){
 var url = "/com.fzzy.igds.Depot.d?parentId="+ id;
 window.$openTab("仓库管理", url);
 }else{
 $notify("请先选择库区……");
 }
 };
 
 renderId = function(arg){
 var txt = arg.data.getText("id");
 if(!txt) return true;
 // 关键修改：点击时把txt作为参数传给detail方法（注意转义双引号）
 var htm = "<a href='javascript:;' onClick='detail(\""+txt+"\")' >"+txt+"</a>";
 arg.dom.innerHTML = htm;
 }
 </ClientEvent> <Property name="packages">font-awesome,css-common</Property> <DataSet id="dsMain"> <Property name="dataProvider">deptPR#getData</Property> <Property name="dataType">[dtMain]</Property> <Property name="loadMode">manual</Property> </DataSet> <Container> <Property name="className">c-param</Property> @@ -186,6 +245,7 @@ <RowSelectorColumn/> <RowNumColumn/> <DataColumn name="id"> <ClientEvent name="onRenderCell">renderId(arg);</ClientEvent> <Property name="property">id</Property> <Property name="align">center</Property> <Property name="width">160</Property> fzzy-igdss-view/src/main/java/com/fzzy/igds/DeptPR.java
@@ -5,10 +5,12 @@ import com.fzzy.igds.domain.Dept; import com.fzzy.igds.service.CoreDeptService; import com.fzzy.igds.utils.ContextUtil; import com.ruoyi.common.utils.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * @Description 库区信息 @@ -42,8 +44,10 @@ * @return */ @DataProvider public List<Dept> getData() { public List<Dept> getData(String parentId) { if(StringUtils.isNotEmpty(parentId)){ return coreDeptService.listDept(null,null,parentId); } return coreDeptService.getDeptData(); }
@@ -157,7 +157,7 @@ <Property name="width">65%</Property> <Property name="caption">分机信息</Property> <Property name="closeable">false</Property> <Property name="height">75%</Property> <Property name="height">90%</Property> <Buttons> <Button> <ClientEvent name="onClick">var cur = view.get("#dsDeviceSer.data:#");
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutLossOver.view.xml
@@ -278,7 +278,6 @@ <Property name="width">60%</Property> <Property name="caption">损益信息</Property> <Property name="closeable">false</Property> <Property name="height">50%</Property> <Buttons> <Button> <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutSettle.view.xml
@@ -594,7 +594,6 @@ <Property name="caption">结算信息</Property> <Property name="width">65%</Property> <Property name="closeable">false</Property> <Property name="height">70%</Property> <Buttons> <Button id="btnOK"> <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutStockChange.view.xml
@@ -324,7 +324,6 @@ <Property name="caption">倒仓信息</Property> <Property name="width">55%</Property> <Property name="closeable">false</Property> <Property name="height">55%</Property> <Buttons> <Button id="btnOK"> <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
 fzzy-igdss-view/src/main/java/com/fzzy/igds/PatrolConf.view.xml
@@ -133,7 +133,6 @@ <Property name="caption">巡更配置信息</Property> <Property name="closeable">false</Property> <Property name="iconClass">fa fa-tasks</Property> <Property name="height">50%</Property> <Buttons> <Button> <ClientEvent name="onClick">view.get("#saveAction").execute(function(){
 fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
@@ -145,7 +145,7 @@ <Property name="caption">质押合同</Property> <Property name="width">65%</Property> <Property name="iconClass">fa fa-tasks</Property> <Property name="height">78%</Property> <Property name="height">90%</Property> <Buttons> <Button id="btnOk"> <ClientEvent name="onClick">view.get("#saveAction").execute(function(){
 fzzy-igdss-view/src/main/java/com/fzzy/igds/QuantityConf.view.xml
@@ -314,7 +314,7 @@ <Property name="caption">数量检测参数</Property> <Property name="width">60%</Property> <Property name="closeable">false</Property> <Property name="height">85%</Property> <Property name="height">90%</Property> <Buttons> <Button> <ClientEvent name="onClick">view.get("#uaMain").execute(function(){
