From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 4
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 33
igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java | 16
igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java | 6
igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java | 8
igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java | 2
igds-inout/src/main/java/com/ld/igds/timer/DepotBookStoreScheduled.java | 123 ++
igds-web/src/main/java/com/ld/igds/web/TestController.java | 163 ++-
igds-core/src/main/java/com/ld/igds/view/Granary.view.xml | 13
igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java | 27
igds-inout/src/main/resources/mapper/InoutCommonMapper.xml | 13
igds-core/src/main/java/com/ld/igds/view/GranaryPR.java | 8
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java | 21
igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java | 4
igds-web/src/main/resources/application-pro.yml | 16
igds-web/src/main/resources/templates/index/index-5329.html | 17
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java | 6
igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java | 2
igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java | 47
igds-warn/src/main/java/com/ld/igds/warn/view/SecureManager.view.xml | 460 +++++++++
igds-web/src/main/resources/static/admin/inout/in-check.js | 34
igds-core/src/main/resources/mapper/SecServiceMapper.xml | 21
igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java | 6
igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java | 33
igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml | 80
igds-web/src/main/resources/verb-conf.properties | 5
igds-manager/src/main/java/com/ld/igds/models/OAStaff.java | 27
igds-core/src/main/java/com/ld/igds/models/SecCamera.java | 22
igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java | 22
igds-web/src/main/resources/static/admin/inout/in-weight.js | 3
igds-web/src/main/resources/templates/admin/inout/in-check.html | 31
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 2
igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml | 165 ++-
igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml | 121 -
igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java | 7
igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml | 619 +++++++++++-
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml | 15
igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml | 90 +
igds-web/src/main/resources/application-pro5333.yml | 80 +
igds-recir/src/main/java/com/ld/igds/models/DrugLog.java | 2
igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml | 2
igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java | 16
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 2
igds-core/src/main/java/com/ld/igds/models/SecureManager.java | 107 ++
igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml | 109 ++
igds-web/src/main/resources/application-pro5303.yml | 3
igds-recir/src/main/java/com/ld/igds/models/Drug.java | 4
igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java | 29
igds-warn/src/main/java/com/ld/igds/warn/service/HSecureManagerService.java | 105 ++
igds-web/src/main/resources/templates/index/index-5303.html | 4
igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java | 9
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 9
igds-warn/src/main/java/com/ld/igds/warn/view/SecureManagerPR.java | 53 +
igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java | 2
igds-web/pom.xml | 20
55 files changed, 2,251 insertions(+), 597 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java b/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
index d0cb7ee..c975486 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/three/service/impl/ThreeServiceImpl1001.java
@@ -99,7 +99,7 @@
return ThreeRespUtil.error(ThreeCodeEnum.CODE_1111, "鏈煡璇㈠埌姝id鐨勯厤缃俊鎭紝璇疯仈绯荤鐞嗗憳锛�", req);
}
List<Depot> depotList = threeMapper.getDepotList(req.getCompanyId(), req.getDeptId(), threeConf.getDepotId());
- if(list.size() > 0){
+ if(null != depotList && depotList.size() > 0){
data1001 = new Data1001();
data1001.setUid(threeConf.getUid());
data1001.setDepotName(depotList.get(0).getName());
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
index 8119ced..70e5b76 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone/service/impl/ServiceImpl5602.java
@@ -12,6 +12,7 @@
import com.ld.igds.phone.service.PhoneService;
import com.ld.igds.phone.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
+import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -26,6 +27,8 @@
@Autowired
private SecManager securityManager;
+ @Autowired
+ private CoreSecCameraService secCameraService;
@Override
public String getInterfaceId() {
@@ -43,19 +46,23 @@
if(param == null || StringUtils.isEmpty(param.getCameraId()) || StringUtils.isEmpty(param.getPlayType())){
return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鍙傛暟寮傚父锛岃閲嶈瘯锛�");
}
- // 鏍规嵁id鑾峰彇璁惧淇℃伅
-// SecCameraDto camera = securityManager.getCameraById(authUser.getCompanyId(), param.getCameraId(), true);
- SecCameraDto cameraParam = new SecCameraDto();
- cameraParam.setId(param.getCameraId());
- cameraParam.setCompanyId(authUser.getCompanyId());
- SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
-
- if (camera == null) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
}
- if (CameraUtil.PLAY_TYPE_DEFAULT.equals(camera.getPlayType())) {
- return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
+ //鑾峰彇璁惧淇℃伅
+ SecCameraDto camera = secCameraService.getCameraById(authUser.getCompanyId(), param.getCameraId());
+ if(null == camera){
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ }
+ if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
+ camera.setPlayAddr(camera.getPhoneAddr());
+ return PhoneRespUtil.success(camera, req);
+ }
+
+ camera = securityManager.getPlayAddr(camera);
+ if (camera == null) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
}
return PhoneRespUtil.success(camera, req);
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
index 1ac4a38..875f00a 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5605.java
@@ -12,6 +12,7 @@
import com.ld.igds.phone35.util.PhoneRespUtil;
import com.ld.igds.sec.dto.SecCameraDto;
import com.ld.igds.sec.manager.SecManager;
+import com.ld.igds.sec.service.CoreSecCameraService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,12 +26,14 @@
public class Phone35ServiceImpl5605 implements Phone35Service {
@Autowired
private SecManager securityManager;
-
+ @Autowired
+ private CoreSecCameraService secCameraService;
@Override
public String getInterfaceId() {
return Phone35Constant.API_PHONE_5605;
}
+ @SuppressWarnings("unchecked")
@Override
public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
//杞寲瀵硅薄
@@ -42,20 +45,24 @@
if (StringUtils.isEmpty(param.getId())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "鍙傛暟鏈夎锛岃閲嶈瘯锛侊紒");
}
- //鍙傛暟楠岃瘉
if (CameraUtil.PLAY_TYPE_DEFAULT.equals(param.getPlayType())) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "绯荤粺鏈厤缃綋鍓嶆憚鍍忓ご鎾斁鏂瑰紡锛屼笉鎵ц棰勮");
}
- SecCameraDto cameraParam = new SecCameraDto();
- cameraParam.setId(param.getId());
- cameraParam.setCompanyId(phone35AuthUser.getCompanyId());
- SecCameraDto camera = securityManager.getPlayAddr(cameraParam);
-
+ //鑾峰彇璁惧淇℃伅
+ SecCameraDto camera = secCameraService.getCameraById(phone35AuthUser.getCompanyId(), param.getId());
if (camera == null) {
return PhoneRespUtil.error(RespCodeEnum.CODE_1007, "鏈煡璇㈠埌鐩稿叧璁惧锛�");
}
+ if(StringUtils.isNotEmpty(camera.getPhoneAddr())){
+ camera.setPlayAddr(camera.getPhoneAddr());
+ return PhoneRespUtil.success(camera, req);
+ }
+ camera = securityManager.getPlayAddr(camera);
+ if (camera == null) {
+ return PhoneRespUtil.error(RespCodeEnum.CODE_1007,"鏈煡璇㈠埌鐩稿叧璁惧锛�");
+ }
return PhoneRespUtil.success(camera, req);
}
diff --git a/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java b/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
index 8c699b8..38557aa 100644
--- a/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
+++ b/igds-base/src/main/java/com/ld/igds/conf/MyBatisPlusConf.java
@@ -196,7 +196,7 @@
*/
public static void main(String[] args) {
try {
- String password = "";
+ String password = "Fzzy@#$%5432..K";
System.out.println("鏄庢枃瀵嗙爜: " + password);
//绉侀挜
String privateKey = DEFAULT_PRIVATE_KEY_STRING;
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java b/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
index 239b707..b6f567f 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/manager/PestManager.java
@@ -247,6 +247,10 @@
// 鑾峰彇鍒嗘満淇℃伅
DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(),
depotConf.getGrainSer());
+ // 鑻ヨ櫕瀹冲垎鏈洪厤缃笉涓虹┖锛屽垯鑾峰彇铏鐨勫垎鏈�
+ if(StringUtils.isNotEmpty(depotConf.getPestSer())){
+ deviceSer = coreSerService.getCacheSer(param.getCompanyId(), depotConf.getPestSer());
+ }
CheckPestRequest request = new CheckPestRequest();
request.setDepotId(param.getDepotId());
diff --git a/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java b/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
index 3684625..f1eeed5 100644
--- a/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
+++ b/igds-basic/src/main/java/com/ld/igds/pest/service/HPestDataService.java
@@ -19,7 +19,7 @@
import com.ld.igds.util.DateUtil;
/**
- *
+ *
* @author: andy.jia
* @description:
* @version:
@@ -34,7 +34,7 @@
if (null == parameter) {
parameter = new HashMap<String, Object>();
}
-
+
Map<String, Object> args = new HashMap<String, Object>();
// 榛樿鑾峰彇6涓湀鐨勬暟鎹俊鎭�
@@ -65,7 +65,7 @@
}
String countHql = "select count(*) " + hql;
- hql += " order by batchId desc";
+ hql += " order by receiveDate desc";
this.pagingQuery(page, hql, countHql, args);
}
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml b/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
index b152e22..d84f9a1 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
@@ -436,7 +436,7 @@
</Container>
</CustomDropDown>
<ListDropDown id="listSymbol">
- <Property name="items">>=,<=,=</Property>
+ <Property name="items">>=,<=,==</Property>
</ListDropDown>
</View>
</ViewConfig>
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
index fca817d..ef48505 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
@@ -70,7 +70,7 @@
item = new CheckItemData();
BeanUtils.copyProperties(data, item);
item.setCheckId(checkId);
- if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
+ if (null != data.getUpperLimit() && data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
item.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
}
result.add(item);
diff --git a/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java b/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java
index d6ab5d9..ff2ecaf 100644
--- a/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java
+++ b/igds-core/src/main/java/com/ld/igds/models/DepotBookStore.java
@@ -3,8 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-import org.springframework.stereotype.Component;
-
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
@@ -16,6 +14,8 @@
* @Author: YYC
* @Description:璐﹂潰搴撳瓨
* @DateTime: 2023/10/20 14:07
+ *
+ * 鎸変粨搴撹繘琛岀粺璁★紝姣忎釜鏈堜綆缁熻涓�娆�(鍥犱笂娴峰競璐﹂潰搴撳瓨鎺ュ彛涓烘寜璐т綅缁熻)
**/
@Data
@Entity
@@ -34,9 +34,13 @@
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @Column(name = "kqdm", length = 21)
+ @Column(name = "DEPT_ID_", length = 20)
@PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
+ private String deptId;
+
+ @Column(name = "DEPOT_ID_", length = 30)
+ @PropertyDef(label = "浠撳簱缂栫爜")
+ private String depotId;
@Column(name = "lspzdm", length = 7)
@PropertyDef(label = "绮鍝佺浠ｇ爜")
@@ -74,10 +78,6 @@
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "涓氬姟鏃ユ湡")
private Date ywrq;
-
- @Column(name = "czbz", length = 1)
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
@Column(name = "zhgxsj")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
diff --git a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
index e80df65..1b49e25 100644
--- a/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
+++ b/igds-core/src/main/java/com/ld/igds/models/SecCamera.java
@@ -52,9 +52,13 @@
@PropertyDef(label = "鎶撴媿鏂瑰紡")
private String snapType;
- @Column(name = "azwzlx", length = 2)
- @PropertyDef(label = "瀹夎浣嶇疆绫诲瀷")
- private String azwzlx;
+ @Column(name = "spjklx", length = 1)
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
+ private String spjklx;
+
+ @Column(name = "spdwlx", length = 2)
+ @PropertyDef(label = "瑙嗛鐐逛綅绫诲瀷")
+ private String spdwlx;
@Column(name = "NAME_", length = 50)
@PropertyDef(label = "鍚嶇О")
@@ -92,6 +96,10 @@
@PropertyDef(label = "娴佸獟浣撳湴鍧�")
private String mediaAddr;
+ @Column(name = "PHONE_ADDR_", length = 100)
+ @PropertyDef(label = "鎵嬫満鐩存挱鍦板潃")
+ private String phoneAddr;
+
@Column(name = "REMARK_", length = 300)
@PropertyDef(label = "澶囨敞")
private String remark;
@@ -115,14 +123,6 @@
@Column(name = "UPDATE_TIME_", length = 1)
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date updateTime;
-
- @Column(name = "spjklx", length = 1)
- @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
- private String spjklx;
-
- @Column(name = "spdwlx", length = 2)
- @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷")
- private String spdwlx;
public int getChanNum() {
return chanNum;
diff --git a/igds-core/src/main/java/com/ld/igds/models/SecureManager.java b/igds-core/src/main/java/com/ld/igds/models/SecureManager.java
new file mode 100644
index 0000000..dfa12cd
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/models/SecureManager.java
@@ -0,0 +1,107 @@
+package com.ld.igds.models;
+
+import com.bstek.dorado.annotation.PropertyDef;
+import lombok.Data;
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 瀹夊叏绠＄悊
+ *
+ * @author czt
+ * @data 2023/10/30
+ */
+@Data
+@Entity
+@Table(name = "D_M_SECURE_MANAGER")
+public class SecureManager implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @Id
+ @Column(name = "fxdbm", length = 12)
+ @PropertyDef(label = "椋庨櫓鐐圭紪鐮�", description = "8浣嶉闄╄瘑鍒棩鏈燂紙YYYYMMDD锛�+4浣嶉闄╅『搴忓彿")
+ private String fxdbm;
+
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
+
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
+
+ @Column(name = "dd", length = 200)
+ @PropertyDef(label = "鍦扮偣")
+ private String dd;
+
+ @Column(name = "sbr", length = 50)
+ @PropertyDef(label = "璇嗗埆浜�")
+ private String sbr;
+
+ @Column(name = "hjbw", length = 200)
+ @PropertyDef(label = "鐜妭/閮ㄤ綅")
+ private String hjbw;
+
+ @Column(name = "fxxx", length = 200)
+ @PropertyDef(label = "椋庨櫓淇℃伅")
+ private String fxxx;
+
+ @Column(name = "fxlx", length = 1)
+ @PropertyDef(label = "椋庨櫓绫诲瀷")
+ private String fxlx;
+
+ @PropertyDef(label = "椋庨櫓绛夌骇")
+ @Column(name = "fxfj", length = 1)
+ private String fxfj;
+
+ @Column(name = "fxglcs", length = 200)
+ @PropertyDef(label = "椋庨櫓绠℃帶鎺柦")
+ private String fxglcs;
+
+ @Column(name = "yhxx", length = 200)
+ @PropertyDef(label = "闅愭偅淇℃伅")
+ private String yhxx;
+
+ @Column(name = "yhpcxx", length = 200)
+ @PropertyDef(label = "闅愭偅鎺掓煡淇℃伅")
+ private String yhpcxx;
+
+ @Column(name = "yhzgxx", length = 200)
+ @PropertyDef(label = "闅愭偅鏁存敼淇℃伅")
+ private String yhzgxx;
+
+ @Column(name = "yhysxx", length = 200)
+ @PropertyDef(label = "闅愭偅鏁存敼楠屾敹淇℃伅")
+ private String yhysxx;
+
+ @Column(name = "sgjbxx", length = 200)
+ @PropertyDef(label = "浜嬫晠鍩烘湰淇℃伅")
+ private String sgjbxx;
+
+ @Column(name = "zgsx", length = 200)
+ @PropertyDef(label = "鏁存敼鏃堕檺")
+ private String zgsx;
+
+ @Column(name = "zrdw", length = 200)
+ @PropertyDef(label = "璐ｄ换鍗曚綅")
+ private String zrdw;
+
+ @Column(name = "zrr", length = 200)
+ @PropertyDef(label = "璐ｄ换浜�")
+ private String zrr;
+
+ @Column(name = "zgysxx", length = 200)
+ @PropertyDef(label = "鏁存敼楠屾敹淇℃伅")
+ private String zgysxx;
+
+ @Column(name = "fxgzjgzrr", length = 50)
+ @PropertyDef(label = "椋庨櫓璺熻釜鐩戠璐ｄ换浜�")
+ private String fxgzjgzrr;
+
+ @Column(name = "updateTime")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ private Date updateTime;
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml
index 8d01c9e..a6417dc 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml
@@ -12,13 +12,29 @@
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="kqdm">
+ <PropertyDef name="deptId">
<Property></Property>
- <Property name="label">搴撳尯浠ｇ爜</Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鎵�灞炰粨搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lspzdm">
<Property></Property>
- <Property name="label">绮鍝佺浠ｇ爜</Property>
+ <Property name="label">绮鍝佺</Property>
<Property name="required">true</Property>
<Property name="mapping">
<Property name="keyProperty">code</Property>
@@ -44,24 +60,25 @@
<Property name="dataType">Double</Property>
<Property name="label">鏈熷垵鏁伴噺</Property>
<Property name="required">true</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
</PropertyDef>
<PropertyDef name="bqsrsl">
<Property name="dataType">Double</Property>
<Property name="label">鏈湡鏀跺叆鏁伴噺</Property>
<Property name="required">true</Property>
- <Property name="displayFormat">#0.000KG</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
</PropertyDef>
<PropertyDef name="bqzcsl">
<Property name="dataType">Double</Property>
<Property name="label">鏈湡鏀嚭鏁伴噺</Property>
<Property name="required">true</Property>
- <Property name="displayFormat">#0.000KG</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
</PropertyDef>
<PropertyDef name="qmye">
<Property name="dataType">Double</Property>
<Property name="label">鏈熸湯鏁伴噺</Property>
<Property name="required">true</Property>
- <Property name="displayFormat">#0.000KG</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
</PropertyDef>
<PropertyDef name="yjbz">
<Property name="dataType">Integer</Property>
@@ -88,30 +105,6 @@
<Property name="dataType">Date</Property>
<Property name="label">涓氬姟鏃ユ湡</Property>
<Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="czbz">
- <Property></Property>
- <Property name="label">鎿嶄綔鏍囧織</Property>
- <Property name="mapping">
- <Property name="keyProperty">key</Property>
- <Property name="valueProperty">value</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="key">i</Property>
- <Property name="value">鏂板鏁版嵁</Property>
- </Entity>
- <Entity>
- <Property name="key">u</Property>
- <Property name="value">淇敼鏁版嵁</Property>
- </Entity>
- <Entity>
- <Property name="key">d</Property>
- <Property name="value">鍒犻櫎鏁版嵁</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
<Property name="dataType">DateTime</Property>
@@ -220,6 +213,10 @@
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<RowNumColumn/>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn name="lspzdm">
<Property name="property">lspzdm</Property>
<Property name="align">center</Property>
@@ -250,14 +247,6 @@
</DataColumn>
<DataColumn name="yjbz">
<Property name="property">yjbz</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ywrq">
- <Property name="property">ywrq</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="czbz">
- <Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="zhgxsj">
@@ -308,6 +297,16 @@
<Property name="cols">*,*</Property>
<Property name="labelWidth">120</Property>
<AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">lspzdm</Property>
<Property name="property">lspzdm</Property>
<Editor/>
@@ -352,11 +351,6 @@
<AutoFormElement>
<Property name="name">ywrq</Property>
<Property name="property">ywrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml b/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
index 1e5df6d..74eafb8 100644
--- a/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/Granary.view.xml
@@ -104,14 +104,6 @@
</PropertyDef>
</DataType>
<DataType name="dtParam">
- <PropertyDef name="depotId">
- <Property name="label">鎵�灞炰粨搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("buildingPR#getCacheBuilding").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
<PropertyDef name="name">
<Property name="label">寤掗棿鍚嶇О</Property>
</PropertyDef>
@@ -170,11 +162,6 @@
<AutoForm>
<Property name="dataSet">dsParam</Property>
<Property name="cols">*,*,*,*</Property>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
<AutoFormElement>
<Property name="name">name</Property>
<Property name="property">name</Property>
diff --git a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
index 81310e9..6dc435d 100644
--- a/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/GranaryPR.java
@@ -5,10 +5,12 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.Granary;
+import com.ld.igds.util.ContextUtil;
import com.ld.igds.view.service.HGranaryService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.util.HashMap;
import java.util.Map;
/**
@@ -32,6 +34,12 @@
@DataProvider
public void pageGranary(Page<Granary> page, Map<String, Object> param)
throws Exception {
+ if(null == param){
+ param = new HashMap<>();
+ }
+ if(null == param.get("deptId")){
+ param.put("deptId", ContextUtil.subDeptId(null));
+ }
granaryService.pageData(page, param);
}
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java
index fa847cf..dd0350f 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDepotBookStoreService.java
@@ -24,7 +24,7 @@
public void listBookStore(Page<DepotBookStore> page, Map<String, Object> param) throws Exception {
StringBuffer hql = new StringBuffer();
- hql.append(" from " + DepotBookStore.class.getName() + " where companyId =:companyId and kqdm =:deptId ");
+ hql.append(" from " + DepotBookStore.class.getName() + " where companyId =:companyId and deptId =:deptId ");
Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
args.put("deptId", ContextUtil.subDeptId(null));
@@ -44,12 +44,10 @@
try {
if (null == data.getId()) {
data.setId(ContextUtil.getUUID());
- data.setKqdm(ContextUtil.subDeptId(null));
+ data.setDeptId(ContextUtil.subDeptId(null));
data.setCompanyId(ContextUtil.getCompanyId());
- data.setCzbz("i");
session.save(data);
} else {
- data.setCzbz("u");
session.update(data);
}
} catch (Exception e) {
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
index ea68d32..da60f04 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HGranaryService.java
@@ -7,7 +7,6 @@
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
-
import java.util.HashMap;
import java.util.Map;
@@ -24,27 +23,29 @@
throws Exception {
String hql = " from " + Granary.class.getName()
+ " where companyId=:companyId";
-
+ if (null == param) {
+ param = new HashMap<>();
+ }
+ String companyId = (String) param.get("companyId");
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
Map<String, Object> args = new HashMap<String, Object>();
- args.put("companyId", ContextUtil.getCompanyId());
+ args.put("companyId", companyId);
- if (null != param) {
+ String str = (String) param.get("deptId");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and deptId =:deptId";
+ args.put("deptId", str);
+ }
- String str = (String) param.get("depotId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and cfbh =:depotId";
- args.put("depotId", str);
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and ajmc like:name";
- args.put("name", "%" + str + "%");
- }
-
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and ajmc like:name";
+ args.put("name", "%" + str + "%");
}
String count = "select count(*) " + hql;
-
hql += " order by updateTime desc";
this.pagingQuery(page, hql, count, args);
diff --git a/igds-core/src/main/resources/mapper/SecServiceMapper.xml b/igds-core/src/main/resources/mapper/SecServiceMapper.xml
index 54c1ba8..3a18c75 100644
--- a/igds-core/src/main/resources/mapper/SecServiceMapper.xml
+++ b/igds-core/src/main/resources/mapper/SecServiceMapper.xml
@@ -8,23 +8,30 @@
<sql id="DATA_COLUMN">
ID_ as id,
+ SN_ AS sn,
COMPANY_ID_ as companyId,
DEPT_ID_ as deptId,
- NAME_ AS name,
- LOGIN_ID_
- AS loginId,
- PWD_ AS pwd,
- BRAND_ AS brand,
TYPE_ AS type,
PLAY_TYPE_ AS playType,
- SN_ AS sn,
+ SNAP_TYPE_ AS snapType,
+ spjklx AS spjklx,
+ spdwlx AS spdwlx,
+ NAME_ AS name,
+ LOGIN_ID_ AS loginId,
+ PWD_ AS pwd,
IP_IN_ AS ipIn,
PORT_IN_C_ AS portInC,
PORT_IN_V_ AS portInV,
CHAN_NUM_ AS chanNum,
+ BRAND_ AS brand,
MEDIA_ADDR_ AS mediaAddr,
+ PHONE_ADDR_ AS phoneAddr,
+ REMARK_ AS remark,
POS_X_ AS posX,
- POS_Y_ AS posY
+ POS_Y_ AS posY,
+ SCREEN_SHOW_ AS screenShow,
+ SNAP_TAG_ AS snapTag,
+ UPDATE_TIME_ AS updateTime
</sql>
<!-- 鏇存柊璁惧浣嶇疆 -->
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index f82095f..6c34071 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -197,6 +197,10 @@
Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
view.addObject("listFoodVariety", listFoodVariety);
+ // 绮鎬ц川涓嬫媺妗�
+ List<DicTrigger> listFoodType = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_TYPE, user.getCompanyId());
+ view.addObject("listFoodType", listFoodType);
+
// 绮绛夌骇涓嬫媺妗�
List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
@@ -288,7 +292,7 @@
view.addObject("cardDto", conf);
//绉伴噸椤甸潰鍒濆鍖�
- inoutManager.initInoutWeight(listInoutConf,sort);
+ inoutManager.initInoutWeight(listInoutConf, sort);
view.setViewName("admin/inout/in-weight");
return view;
@@ -696,6 +700,7 @@
/**
* 鏍规嵁璐ㄦ鍗曞彿鑾峰彇鍑哄叆搴撲俊鎭�
+ *
* @param param
* @return
*/
@@ -715,7 +720,7 @@
*/
@RequestMapping("/submit-checkItem")
@Transactional
- public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data)throws Exception {
+ public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data) throws Exception {
return inoutManager.submitCheckData(data);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
index ca05916..d18dd78 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
@@ -46,6 +46,8 @@
private String depotId;
//绮鍝佺
private String foodVariety;
+ //绮鍝佺
+ private String foodType;
//璐ㄦ鍗曞彿
private String checkId;
//鍗曚环
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 200a5de..28bac20 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -256,7 +256,9 @@
}
if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
+ if (StringUtils.isEmpty(data.getCheckUser())) {
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ }
data.setProgress(nextProgress);
return data;
}
@@ -397,11 +399,22 @@
}
String loginUser = ContextUtil.getLoginUserCName();
- data.setRegisterUser(loginUser);
- data.setFullWeightUser(loginUser);
- data.setEmptyWeightUser(loginUser);
- data.setHandleUser(loginUser);
- data.setCompleteUser(loginUser);
+ if (StringUtils.isEmpty(data.getRegisterUser())) {
+ data.setRegisterUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getFullWeightUser())) {
+ data.setFullWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getEmptyWeightUser())) {
+ data.setEmptyWeightUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getHandleUser())) {
+ data.setHandleUser(loginUser);
+ }
+ if (StringUtils.isEmpty(data.getCompleteUser())) {
+ data.setCompleteUser(loginUser);
+ }
+
if (null == data.getCompleteTime()) {
data.setCompleteTime(new Date());
}
@@ -414,7 +427,7 @@
if (null == data.getIntelCard()) {
data.setIntelCard(data.getUserId());
}
- if (null != data.getCheckItems()) {
+ if (null != data.getCheckItems() && StringUtils.isEmpty(data.getCheckUser())) {
data.setCheckUser(loginUser);
}
@@ -628,7 +641,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg, data);
}
- if(null != files && files.size()>0){
+ if (null != files && files.size() > 0) {
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
}
@@ -666,7 +679,7 @@
data);
}
- if(null != files && files.size()>0){
+ if (null != files && files.size() > 0) {
// 鎵ц闄勪欢淇℃伅
fileService.saveInoutFiles(files, data.getCompanyId(), data.getId(), curProgress);
}
@@ -864,6 +877,7 @@
curData.setCheckTime(new Date());
data.setCheckTime(new Date());
}
+ curData.setCheckUser(data.getCheckUser());
curData.setCheckStatus(data.getCheckStatus());
curData.setFoodYear(data.getFoodYear());
@@ -887,6 +901,7 @@
curData.setCheckItems(data.getCheckItems());
curData.setCheckTime(data.getCheckTime());
curData.setDepotId(data.getDepotId());
+ curData.setFoodType(data.getFoodType());
if (StringUtils.isEmpty(data.getCheckUser())) {
curData.setCheckUser(ContextUtil.getLoginUserCName());
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
index ad0ae3a..990792e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java
@@ -29,6 +29,7 @@
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -551,7 +552,6 @@
data.setDepotId(item.getDepotId());
}
if (data.getDepotId().equals(item.getDepotId())) {
-
inoutParam.setId(data.getRecordId());
} else {
String newId = data.getRecordId() + temp;
@@ -585,11 +585,15 @@
map.put(inoutParam.getId(), inoutParam);
}
InoutParam par;
+ InoutData dat;
for (String key : map.keySet()) {
par = map.get(key);
if (par != null) {
+ dat = new InoutData();
//鏇存柊娴佹按鏁版嵁(鍖呭惈閲嶉噺淇℃伅浠ュ強娴佺▼杩涘害淇℃伅)
inoutService.toComplete(par);
+ BeanUtils.copyProperties(par, dat);
+ inoutService.updateData(dat);
// //鏇存柊浠撳簱搴撳瓨
// if (InoutConstant.TYPE_IN.equals(par.getType())) {
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
index 3a863c0..57eadbb 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java
@@ -6,6 +6,7 @@
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
+
import java.util.*;
@Component
@@ -42,10 +43,10 @@
hql += " and type <> 'LOSS' and type <> 'OVER'";
}
- str = (String) param.get("customerId");
+ str = (String) param.get("noticeId");
if (StringUtils.isNotEmpty(str)) {
- hql += " and customerId=:customerId ";
- args.put("customerId", str);
+ hql += " and noticeId=:noticeId ";
+ args.put("noticeId", str);
}
str = (String) param.get("progress");
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index dd23a2f..9b2fa2e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -14,6 +14,7 @@
</PropertyDef>
<PropertyDef name="userId">
<Property name="label">韬唤璇佸彿</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="noticeId">
<Property name="label">閫氱煡鍗曞彿</Property>
@@ -22,6 +23,15 @@
<Property name="dataType">Double</Property>
<Property name="label">绮瀹氫环</Property>
<Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="foodType">
+ <Property name="label">绮鎬ц川</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ </Property>
</PropertyDef>
<Reference name="checkItems">
<Property name="parameter">
@@ -608,6 +618,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">foodType</Property>
+ <Property name="property">foodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">sampleUser</Property>
<Property name="property">sampleUser</Property>
<Editor/>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
index 784f6c1..edb1af7 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml
@@ -19,7 +19,7 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="customerId">
+ <PropertyDef name="noticeId">
<Property></Property>
<Property name="label">鍙戣揣鍗曚綅</Property>
</PropertyDef>
@@ -112,12 +112,6 @@
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
<Editor/>
@@ -125,8 +119,14 @@
<AutoFormElement>
<Property name="name">customerName</Property>
<Property name="property">customerName</Property>
- <Property name="trigger">ddCustomer</Property>
+ <Property name="trigger">ddNotice</Property>
<Property name="editable">false</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Property name="trigger">autoMappingDropDown2</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -375,5 +375,79 @@
</DataGrid>
</Container>
</CustomDropDown>
+ <CustomDropDown id="ddNotice">
+ <ClientEvent name="onOpen">var data = view.get("#dsQuery.data");
+var type = data.get("type");
+if(type){
+ view.get("#dsNotice").set("parameter",{type: type}).flushAsync();
+}else{
+ $alert("璇峰厛閫夋嫨鍑哄叆搴撶被鍨�")
+}
+</ClientEvent>
+ <Property name="minHeight">400</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
+ <Property name="minWidth">1000</Property>
+ <Property name="autoOpen">true</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsNotice">
+ <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
+ <Property name="dataType">[dtNoticeDto]</Property>
+ <Property name="parameter"/>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key3">
+ <Property name="blankText"> -- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key3.value");
+var type = "${request.getParameter('type')}";
+view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").close(data.toJSON());
+}</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsNotice</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">customerName</Property>
+ <Property name="align">center</Property>
+ <Property name="name">customerName</Property>
+ <Property name="width">240</Property>
+ </DataColumn>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="year">
+ <Property name="property">year</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="contractName">
+ <Property name="property">contractName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">300</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
index 73a816d..293b6fe 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
@@ -27,23 +27,18 @@
public void pageQueryIn(Page<InoutNoticeIn> page, Map<String, Object> param) throws Exception {
String hql = " from " + InoutNoticeIn.class.getName()
- + " where companyId =:companyId";
+ + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
Object year = param.get("year");
if (year == null) {
param.put("year", DateFormatUtils.format(new Date(), "yyyy"));
}
- String str = (String) param.get("deptId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and deptId =:deptId";
- args.put("deptId", str);
- }
-
- str = (String) param.get("id");
+ String str = (String) param.get("id");
if (StringUtils.isNotEmpty(str)) {
hql += " and id=:id";
args.put("id", str);
@@ -143,23 +138,18 @@
public void pageQueryOut(Page<InoutNoticeOut> page, Map<String, Object> param) throws Exception {
String hql = " from " + InoutNoticeOut.class.getName()
- + " where companyId =:companyId";
+ + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
Object year = param.get("year");
if (year == null) {
param.put("year", DateFormatUtils.format(new Date(), "yyyy"));
}
- String str = (String) param.get("deptId");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and deptId =:deptId";
- args.put("deptId", str);
- }
-
- str = (String) param.get("id");
+ String str = (String) param.get("id");
if (StringUtils.isNotEmpty(str)) {
hql += " and id =:id";
args.put("id", str);
diff --git a/igds-inout/src/main/java/com/ld/igds/timer/DepotBookStoreScheduled.java b/igds-inout/src/main/java/com/ld/igds/timer/DepotBookStoreScheduled.java
new file mode 100644
index 0000000..7889cae
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/timer/DepotBookStoreScheduled.java
@@ -0,0 +1,123 @@
+package com.ld.igds.timer;
+
+import com.bstek.bdf2.core.model.DefaultCompany;
+import com.ld.igds.common.CoreCommonService;
+import com.ld.igds.constant.Constant;
+import com.ld.igds.constant.DepotStatus;
+import com.ld.igds.inout.InoutConstant;
+import com.ld.igds.inout.dto.InoutData;
+import com.ld.igds.inout.dto.InoutParam;
+import com.ld.igds.inout.service.InoutService;
+import com.ld.igds.models.DepotStore;
+import com.ld.igds.models.InoutLossOver;
+import com.ld.igds.models.InoutRecord;
+import com.ld.igds.util.ContextUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.DateUtils;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @Desc: 璐﹂潰搴撳瓨 - 姣忔湀搴曡嚜鍔ㄧ粺璁℃瘡涓粨搴撶殑璐﹂潰搴撳瓨
+ * @author: czt
+ * @update-time: 2023/10/30
+ */
+@Slf4j
+@Component(DepotBookStoreScheduled.BEAN_ID)
+public class DepotBookStoreScheduled {
+
+ public static final String BEAN_ID = "inout.depotBookStoreScheduled";
+
+ @Resource
+ private InoutService inoutService;
+
+ @Resource
+ private CoreCommonService commonService;
+
+ /**
+ * 姣忔湀鏈�鍚庝竴澶�22鐐�25鍒嗘墽琛�
+ */
+ @Scheduled(cron = "0 25 22 28-31 * ?")
+ public void scheduled() {
+
+ final Calendar c = Calendar.getInstance();
+ //濡傛灉鏄渶鍚庝竴澶� 鍒欐墽琛屽畾鏃朵换鍔�
+ if (c.get(Calendar.DATE) == c.getActualMaximum(Calendar.DATE)) {
+
+ List<DefaultCompany> listCompany = commonService.getCompanyList();
+ if (null == listCompany){
+ return;
+ }
+
+ for (DefaultCompany company : listCompany) {
+ //TODO 缁熻姣忎釜浠撳簱璐﹂潰搴撳瓨
+
+ }
+ }
+ }
+
+ /**
+ * 缁熻璐﹂潰搴撳瓨
+ * @param companyId
+ * @param listLossOver
+ * @param param
+ */
+ private void sumDepotBookStore(String companyId, List<InoutLossOver> listLossOver, InoutParam param) {
+
+// if (null == listLossOver || listLossOver.isEmpty()) {
+// log.info("-----------绯荤粺鑷姩鍚屾搴撳瓨锛岃繎鏈熸棤鎹熺泭璁板綍锛屽彇娑堝悓姝ヤ粨搴撳簱瀛樷�︹�}", companyId);
+// return;
+// }
+//
+// // 鑾峰彇鏈夊嚭鍏ュ簱璁板綍鐨勪粨搴�
+// Map<String, InoutLossOver> map = new HashMap<>();
+// String key;
+// DepotStore lastStore;
+// double sumRecordWeight = 0.0;
+// for (InoutLossOver data : listLossOver) {
+// key = data.getDepotId() + "_" + data.getType();
+// if (null != map.get(key)) {
+// continue;
+// }
+//
+// map.put(key, data);
+//
+// // 鏍规嵁鏈�鍚庝竴杞﹁繘琛屾眹鎬荤粺璁★紝寮�濮嬫椂闂存槸浠撳簱搴撳瓨鏈�鍚庝竴涓椂闂存埅姝㈠埌褰撳墠
+// lastStore = commonService.getLastDepotStore(data.getDepotId());
+// if (null == lastStore) {
+// log.error("--------搴撳瓨瀹氭椂浠诲姟-----娌℃湁鑾峰彇鍒颁粨搴撴渶鍚庡簱瀛樹俊鎭紝鍙栨秷鑷姩缁熻锛岃鏍稿涓氬姟閫昏緫--浠撳簱-{}",
+// data.getDepotId());
+// continue;
+// }
+//
+// param.setDeptId(data.getDeptId());
+// param.setDepotId(data.getDepotId());
+// param.setCompanyId(data.getCompanyId());
+// param.setType(data.getType());
+//
+// //鑾峰彇鍑哄叆搴撶殑閲嶉噺淇℃伅
+// sumRecordWeight = inoutService.sumLossOverWeight(param);
+//
+// //鏂板涓�鏉″簱瀛樿褰�
+// lastStore.setRemark("绯荤粺瀹氭椂鐢熸垚璁板綍");
+// lastStore.setId(ContextUtil.getUUID());
+// lastStore.setUpdateUser("绯荤粺绠＄悊鍛�");
+// lastStore.setUpdateDate(new Date());
+// lastStore.setCreateDate(new Date());
+// if(Constant.LOSS_OVER_LOSS.equals(data.getType())){
+// lastStore.setStorageReal(lastStore.getStorageReal() + sumRecordWeight);
+//
+// }
+// if(Constant.LOSS_OVER_OVER.equals(data.getType())){
+// lastStore.setStorageReal(lastStore.getStorageReal() - sumRecordWeight);
+// }
+//
+// lastStore.setStorageSettle(lastStore.getStorageReal());
+// commonService.addDepotStore(lastStore, true);
+// }
+ }
+
+}
\ No newline at end of file
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index 29ed5d6..2bcd325 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -80,6 +80,7 @@
CHECK_STATUS_ AS checkStatus,
REMARKS_ AS remarks,
FOOD_YEAR_ AS foodYear,
+ FOOD_TYPE_ AS foodType,
IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
from
D_INOUT_RECORD
@@ -115,6 +116,7 @@
<if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
<if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
<if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
+ <if test="data.foodType != null">FOOD_Type_ = #{data.foodType},</if>
<if test="data.deCheck != null">DE_CHECK_ = #{data.deCheck},</if>
<if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
<if test="data.price != null">PRICE_ = #{data.price},</if>
diff --git a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
index c0a1fb2..aed17a0 100644
--- a/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCommonMapper.xml
@@ -293,14 +293,12 @@
<update id="reSumNoticeInComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
update D_INOUT_NOTICE_IN t,(
SELECT
- r.CUSTOMER_ID_,
r.FOOD_VARIETY_,
r.NOTICE_ID_,
- sum (r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
+ sum(r.RECORD_WEIGHT_) as COMPLETE_NUMBER_
from d_inout_record r
where r.COMPANY_ID_ = #{param.companyId}
and r.DEPT_ID_ = #{param.deptId}
- and r.CUSTOMER_ID_ = #{param.customerId}
and r.FOOD_VARIETY_ = #{param.foodVariety}
and r.NOTICE_ID_ = #{param.id}
and r.RECORD_STATUS_ != 'DEL'
@@ -308,8 +306,8 @@
GROUP BY r.FOOD_VARIETY_
) b
SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
- WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
- AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
+ WHERE
+ t.FOOD_VARIETY_ = b.FOOD_VARIETY_
AND t.ID_ = b.NOTICE_ID_
</update>
@@ -465,7 +463,6 @@
<update id="reSumNoticeOutComplete" parameterType="com.ld.igds.m.dto.NoticeParam">
update D_INOUT_NOTICE_OUT t,(
SELECT
- r.CUSTOMER_ID_,
r.FOOD_VARIETY_,
r.DEPOT_ID_,
r.NOTICE_ID_,
@@ -473,7 +470,6 @@
from d_inout_record r
where r.COMPANY_ID_ = #{param.companyId}
AND r.DEPT_ID_ = #{param.deptId}
- and r.CUSTOMER_ID_ = #{param.customerId}
and r.DEPOT_ID_ = #{param.depotId}
and r.FOOD_VARIETY_ = #{param.foodVariety}
and r.RECORD_STATUS_ != 'DEL'
@@ -481,8 +477,7 @@
GROUP BY r.DEPOT_ID_
) b
SET t.COMPLETE_NUMBER_ = b.COMPLETE_NUMBER_
- WHERE t.CUSTOMER_ID_ = b.CUSTOMER_ID_
- AND t.FOOD_VARIETY_ = b.FOOD_VARIETY_
+ WHERE t.FOOD_VARIETY_ = b.FOOD_VARIETY_
AND t.DEPOT_ID_ = b.DEPOT_ID_
AND t.ID_ = b.NOTICE_ID_
</update>
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 9e6172d..ce2d3ab 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -536,10 +536,10 @@
<if test="param.foodVariety != null and param.foodVariety != ''">AND FOOD_VARIETY_ = #{param.foodVariety}</if>
<if test="param.id != null and param.id != ''">AND NOTICE_ID_ = #{param.id}</if>
<if test="param.start != null">AND
- COMPLETE_TIME_ <![CDATA[ > ]]> #{param.start}
+ UPDATE_TIME_ <![CDATA[ > ]]> #{param.start}
</if>
<if test="param.end != null">AND
- COMPLETE_TIME_ <![CDATA[ < ]]> #{param.end}
+ UPDATE_TIME_ <![CDATA[ < ]]> #{param.end}
</if>
</select>
diff --git a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
index ec90fa8..6436f8d 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/DeptDevice.java
@@ -3,7 +3,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-
import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -20,29 +19,17 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID")
- private String id;
-
- @Column(name = "kqdm", length = 40)
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
+ @Column(name = "sbbh", length = 20)
+ @PropertyDef(label = "璁惧缂栧彿")
+ private String sbbh;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜", description = "")
private String companyId;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @Column(name = "kqmc", length = 256)
- @PropertyDef(label = "搴撳尯鍚嶇О")
- private String kqmc;
-
- @Column(name = "sbbh", length = 20)
- @PropertyDef(label = "璁惧缂栧彿")
- private String sbbh;
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "鎵�灞炲簱鍖�")
+ private String deptId;
@Column(name = "sbyqmc", length = 50)
@PropertyDef(label = "璁惧浠櫒鍚嶇О")
@@ -75,7 +62,6 @@
@Column(name = "jdsj")
@PropertyDef(label = "妫�瀹氭椂闂�")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date jdsj;
@Column(name = "jddw", length = 256)
@@ -84,7 +70,6 @@
@Column(name = "UPDATE_TIME_")
@PropertyDef(label = "鏇存柊鏃堕棿")
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date updateTime;
}
diff --git a/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java b/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
index c359c92..0b862ad 100644
--- a/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
+++ b/igds-manager/src/main/java/com/ld/igds/models/OAStaff.java
@@ -25,30 +25,31 @@
@Table(name = "D_OA_STAFF")
public class OAStaff implements Serializable {
private static final long serialVersionUID = 1L;
+
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID")
- private String id;
+ @Column(name = "sfzhm", length = 18)
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜", description = "")
private String companyId;
- @Column(name = "dwdm", length = 18)
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @Column(name = "dwmc", length = 256)
- @PropertyDef(label = "鍗曚綅鍚嶇О")
- private String dwmc;
+ @Column(name = "DEPT_ID_", length = 20)
+ @PropertyDef(label = "搴撳尯缂栫爜", description = "")
+ private String deptId;
@Column(name = "lsbm", length = 256)
@PropertyDef(label = "闅跺睘閮ㄩ棬", description = "闅跺睘閮ㄩ棬鍚嶇О")
private String lsbm;
@Column(name = "xzqhdm", length = 6)
- @PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
private String xzqhdm;
+
+ @Column(name = "xzqhmc", length = 6)
+ @PropertyDef(label = "鎵�灞炶鏀垮尯鍒�")
+ private String xzqhmc;
@Column(name = "xm", length = 32)
@PropertyDef(label = "濮撳悕")
@@ -57,10 +58,6 @@
@Column(name = "xb", length = 1)
@PropertyDef(label = "鎬у埆")
private String xb;
-
- @Column(name = "sfzhm", length = 18)
- @PropertyDef(label = "韬唤璇佸彿鐮�")
- private String sfzhm;
@Column(name = "rzrq")
@PropertyDef(label = "鍏ヨ亴鏃ユ湡")
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
index 37a7a54..0fc419d 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HDeptDeviceService.java
@@ -9,6 +9,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -34,10 +35,11 @@
//=====================================搴撳尯璁惧=======================================//
public void pageData(Page<DeptDevice> page, Map<String, Object> param)
throws Exception {
- String hql = " from " + DeptDevice.class.getName() + " where companyId=:companyId";
+ String hql = " from " + DeptDevice.class.getName() + " where companyId =:companyId and deptId =:deptId";
Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
if (null != param) {
hql = buildHql(hql, param, args);
@@ -57,14 +59,12 @@
if (null == data.getCompanyId()) {
data.setCompanyId(ContextUtil.getCompanyId());
}
- if (StringUtils.isEmpty(data.getKqdm())) {
- data.setKqdm(ContextUtil.subDeptId(null));
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(null));
}
- DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getKqdm());
- data.setKqmc(dept.getName());
data.setUpdateTime(new Date());
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
+ if (null == data.getSbbh()) {
+ data.setSbbh(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
}
session.saveOrUpdate(data);
} finally {
@@ -74,6 +74,39 @@
return null;
}
+ public String getIndex(String companyId) {
+ List<DeptDevice> list = getDataByTime(companyId);
+ int index = 10000;
+ if (list != null && list.size() > 0) {
+ String id = list.get(0).getSbbh().substring(8);
+ int temp = Integer.valueOf(id) + 1;
+ index += temp;
+ }else {
+ index ++;
+ }
+ return String.valueOf(index).substring(1);
+ }
+
+ private List<DeptDevice> getDataByTime(String companyId) {
+ String hql = " from " + DeptDevice.class.getName()
+ + " where companyId =:companyId ";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", companyId);
+
+ hql += " and updateTime >:startTime";
+ args.put("startTime", DateUtil.getCurZero(new Date()));
+
+
+ hql += " and updateTime <:endTime";
+ args.put("endTime", DateUtil.getNextZero(new Date()));
+
+
+ hql += " order by id desc";
+
+ return this.query(hql, args);
+ }
+
public String delData(DeptDevice data) {
Session session = this.getSessionFactory().openSession();
try {
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
index a867e98..c9b088b 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
+++ b/igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java
@@ -68,13 +68,13 @@
}
public String saveOrUpdate(OAStaff data) {
-
+ //鍒ゆ柇缁勭粐缂栫爜
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(data.getCompanyId());
+ }
Session session = this.getSessionFactory().openSession();
try {
data.setCompanyId(ContextUtil.getCompanyId());
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
- }
session.saveOrUpdate(data);
} finally {
session.flush();
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
index 83ea38b..068802c 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/DeptDevice.view.xml
@@ -5,48 +5,95 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.DeptDevice</Property>
- <PropertyDef name="id">
- <Property name="label">ID</Property>
+ <PropertyDef name="sbbh">
+ <Property/>
+ <Property name="label">璁惧缂栧彿</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
- <PropertyDef name="kqdm">
- <Property></Property>
- <Property name="label">搴撳尯浠ｇ爜</Property>
+ <PropertyDef name="companyId">
+ <Property/>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property/>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="required">true</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="companyId">
- <Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="dwdm">
- <Property></Property>
- <Property name="label">鍗曚綅浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="kqmc">
- <Property></Property>
- <Property name="label">搴撳尯鍚嶇О</Property>
- </PropertyDef>
- <PropertyDef name="sbbh">
- <Property></Property>
- <Property name="label">璁惧缂栧彿</Property>
- </PropertyDef>
<PropertyDef name="sbyqmc">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧浠櫒鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="sbyqdm">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧浠櫒浠ｇ爜</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-绮补閫氱敤鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-绮粨鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-妫�楠屽寲楠屼华鍣ㄨ澶�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14-璁￠噺璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15-娣�绮夌敓浜ф満姊拌澶�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16-鍒剁矇鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">17</Property>
+ <Property name="value">17-纰剧背鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">18</Property>
+ <Property name="value">18-绮补椋熷搧鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">21</Property>
+ <Property name="value">21-楗叉枡鍔犲伐鏈烘璁惧</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">22</Property>
+ <Property name="value">22-娌硅剛鍔犲伐鏈烘鍜岃澶�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">99</Property>
+ <Property name="value">99-鍏朵粬绮璁惧</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
</PropertyDef>
<PropertyDef name="sbggxh">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧瑙勬牸鍨嬪彿</Property>
</PropertyDef>
<PropertyDef name="sccj">
- <Property></Property>
+ <Property/>
<Property name="label">鐢熶骇鍘傚</Property>
</PropertyDef>
<PropertyDef name="scrq">
@@ -54,11 +101,11 @@
<Property name="label">鐢熶骇鏃ユ湡</Property>
</PropertyDef>
<PropertyDef name="sbms">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧鎻忚堪</Property>
</PropertyDef>
<PropertyDef name="sbzt">
- <Property></Property>
+ <Property/>
<Property name="label">璁惧鐘舵��</Property>
<Property name="mapping">
<Property name="keyProperty">key</Property>
@@ -66,20 +113,20 @@
<Property name="mapValues">
<Collection>
<Entity>
- <Property name="key">1</Property>
- <Property name="value">1锛氬畬濂�</Property>
+ <Property name="key">1</Property>
+ <Property name="value">1-瀹屽ソ</Property>
</Entity>
<Entity>
- <Property name="key">2</Property>
- <Property name="value">2锛氭姤搴�</Property>
+ <Property name="key">2</Property>
+ <Property name="value">2-鎶ュ簾</Property>
</Entity>
<Entity>
- <Property name="key">3</Property>
- <Property name="value">3锛氬緟妫�淇�</Property>
+ <Property name="key">3</Property>
+ <Property name="value">3-寰呮淇�</Property>
</Entity>
<Entity>
- <Property name="key">4</Property>
- <Property name="value">4锛氬叾浠�</Property>
+ <Property name="key">4</Property>
+ <Property name="value">4-鍏朵粬</Property>
</Entity>
</Collection>
</Property>
@@ -90,13 +137,12 @@
<Property name="label">妫�瀹氭椂闂�</Property>
</PropertyDef>
<PropertyDef name="jddw">
- <Property></Property>
+ <Property/>
<Property name="label">妫�瀹氬崟浣�</Property>
</PropertyDef>
<PropertyDef name="updateTime">
- <Property name="dataType">Date</Property>
+ <Property name="dataType">DateTime</Property>
<Property name="label">鏇存柊鏃堕棿</Property>
- <Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -284,65 +330,50 @@
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
</RowNumColumn>
- <DataColumn name="dwdm">
- <Property name="property">dwdm</Property>
- <Property name="align">center</Property>
+ <DataColumn name="sbbh">
+ <Property name="property">sbbh</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
- <DataColumn name="kqmc">
- <Property name="property">kqmc</Property>
- <Property name="align">center</Property>
+ <DataColumn name="deptId">
+ <Property name="property">deptId</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="sbyqmc">
<Property name="property">sbyqmc</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="sbyqdm">
- <Property name="property">sbyqdm</Property>
<Property name="align">center</Property>
- <Property name="readOnly">true</Property>
</DataColumn>
<DataColumn name="sbggxh">
<Property name="property">sbggxh</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="sccj">
- <Property name="property">sccj</Property>
<Property name="align">center</Property>
- <Property name="readOnly">true</Property>
</DataColumn>
<DataColumn name="scrq">
<Property name="property">scrq</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
- </DataColumn>
- <DataColumn name="sbms">
- <Property name="property">sbms</Property>
<Property name="align">center</Property>
- <Property name="readOnly">true</Property>
</DataColumn>
<DataColumn name="sbzt">
<Property name="property">sbzt</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="jdsj">
<Property name="property">jdsj</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="jddw">
<Property name="property">jddw</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="updateTime">
<Property name="property">updateTime</Property>
- <Property name="align">center</Property>
<Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
</DataColumn>
</DataGrid>
</Container>
@@ -386,13 +417,13 @@
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">150</Property>
<AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
+ <Property name="name">sbbh</Property>
+ <Property name="property">sbbh</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sbbh</Property>
- <Property name="property">sbbh</Property>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
diff --git a/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
index c386492..7b453e3 100644
--- a/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
+++ b/igds-manager/src/main/java/com/ld/igds/oa/view/Staff.view.xml
@@ -5,33 +5,44 @@
<Model>
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.OAStaff</Property>
- <PropertyDef name="id">
+ <PropertyDef name="sfzhm">
<Property></Property>
- <Property name="label">ID</Property>
+ <Property name="label">韬唤璇佸彿鐮�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="dwdm">
+ <PropertyDef name="deptId">
<Property></Property>
- <Property name="label">鍗曚綅浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="dwmc">
- <Property></Property>
- <Property name="label">鍗曚綅鍚嶇О</Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lsbm">
<Property></Property>
<Property name="label">闅跺睘閮ㄩ棬</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xzqhdm">
<Property></Property>
- <Property name="label">琛屾斂鍖哄垝浠ｇ爜</Property>
+ <Property name="label">鎵�灞炶鏀垮尯鍒�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="xzqhmc">
+ <Property></Property>
+ <Property name="label">鎵�灞炶鏀垮尯鍒�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xm">
<Property></Property>
<Property name="label">濮撳悕</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="xb">
<Property></Property>
@@ -52,32 +63,58 @@
</Collection>
</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="sfzhm">
- <Property></Property>
- <Property name="label">韬唤璇佸彿鐮�</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rzrq">
<Property name="dataType">Date</Property>
<Property name="label">鍏ヨ亴鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="gwxz">
<Property></Property>
<Property name="label">宀椾綅鎬ц川</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("GWXZ")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-鍦ㄥ矖鑱屽伐(闀挎湡)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-鍦ㄥ矖鑱屽伐(涓存椂)</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">20</Property>
+ <Property name="value">20-鍏朵粬浠庝笟浜哄憳</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zgzt">
<Property></Property>
<Property name="label">鍦ㄥ矖鐘舵��</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZGZT")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-鍦ㄥ矖</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-宸茬鑱�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="lzrq">
<Property></Property>
@@ -100,27 +137,382 @@
<Property></Property>
<Property name="label">姘戞棌</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("MZ")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-姹夋棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-钂欏彜鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">03</Property>
+ <Property name="value">03-鍥炴棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">04</Property>
+ <Property name="value">04-钘忔棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">05</Property>
+ <Property name="value">05-缁村惥灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">06</Property>
+ <Property name="value">06-鑻楁棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">07</Property>
+ <Property name="value">07-褰濇棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">08</Property>
+ <Property name="value">08-澹棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">09</Property>
+ <Property name="value">09-甯冧緷鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10-鏈濋矞鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-婊℃棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-渚楁棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-鐟舵棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">14</Property>
+ <Property name="value">14-鐧芥棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">15</Property>
+ <Property name="value">15-鍦熷鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">16</Property>
+ <Property name="value">16-鍝堝凹鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">17</Property>
+ <Property name="value">17-鍝堣惃鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">18</Property>
+ <Property name="value">18-鍌ｆ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">19</Property>
+ <Property name="value">19-榛庢棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">20</Property>
+ <Property name="value">20-鍌堝兂鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">21</Property>
+ <Property name="value">21-浣ゆ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">22</Property>
+ <Property name="value">22-鐣叉棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">23</Property>
+ <Property name="value">23-楂樺北鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">24</Property>
+ <Property name="value">24-鎷夌鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">25</Property>
+ <Property name="value">25-姘存棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">26</Property>
+ <Property name="value">26-涓滀埂鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">27</Property>
+ <Property name="value">27-绾宠タ鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">28</Property>
+ <Property name="value">28-鏅鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">29</Property>
+ <Property name="value">29-鏌皵鍏嬪瓬鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">30</Property>
+ <Property name="value">30-鍦熸棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">31</Property>
+ <Property name="value">31-杈炬枴灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">32</Property>
+ <Property name="value">32-浠浆鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">33</Property>
+ <Property name="value">33-缇屾棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">34</Property>
+ <Property name="value">34-甯冩湕鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">35</Property>
+ <Property name="value">35-鎾掓媺鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">36</Property>
+ <Property name="value">36-姣涘崡鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">37</Property>
+ <Property name="value">37-浠′浆</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">38</Property>
+ <Property name="value">38-閿′集鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">39</Property>
+ <Property name="value">39-闃挎槍鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">40</Property>
+ <Property name="value">40-鏅背鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">41</Property>
+ <Property name="value">41-濉斿悏鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">42</Property>
+ <Property name="value">42-鎬掓棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">43</Property>
+ <Property name="value">43-涔屽瓬鍒厠鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">44</Property>
+ <Property name="value">44-淇勭綏鏂棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">45</Property>
+ <Property name="value">45-閯傛俯鍏嬫棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">46</Property>
+ <Property name="value">46-宕╅緳鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">47</Property>
+ <Property name="value">47-淇濆畨鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">48</Property>
+ <Property name="value">48-瑁曞浐鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">49</Property>
+ <Property name="value">49-浜棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">50</Property>
+ <Property name="value">50-濉斿灏旀棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">51</Property>
+ <Property name="value">51-鐙緳鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">52</Property>
+ <Property name="value">52-閯備鸡鏄ユ棌</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">53</Property>
+ <Property name="value">53-璧摬鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">54</Property>
+ <Property name="value">54-闂ㄥ反鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">55</Property>
+ <Property name="value">55-鐝炲反鏃�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">56</Property>
+ <Property name="value">56-鍩鸿鏃�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zzmm">
<Property></Property>
<Property name="label">鏀挎不闈㈣矊</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("ZZMM")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">01</Property>
+ <Property name="value">01-涓浗鍏变骇鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">02</Property>
+ <Property name="value">02-涓浗鍏变骇鍏氶澶囧厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">03</Property>
+ <Property name="value">03-涓浗鍏变骇涓讳箟闈掑勾鍥㈠洟鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">04</Property>
+ <Property name="value">04-涓浗鍥芥皯鍏氶潻鍛藉鍛樹細浼氬憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">05</Property>
+ <Property name="value">05-涓浗涓诲悓鐩熺洘鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">06</Property>
+ <Property name="value">06-涓浗姘戜富寤哄浗浼氫細鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">07</Property>
+ <Property name="value">07-涓浗姘戜富淇冭繘浼氫細鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">08</Property>
+ <Property name="value">08-涓浗鍐滃伐姘戜富鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">09</Property>
+ <Property name="value">09-涓浗鑷村叕鍏氬厷鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">10</Property>
+ <Property name="value">10-涔濅笁瀛︾ぞ绀惧憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">11</Property>
+ <Property name="value">11-鍙版咕姘戜富鑷不鍚岀洘鐩熷憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">12</Property>
+ <Property name="value">12-鏃犲厷娲炬皯涓讳汉澹�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">13</Property>
+ <Property name="value">13-缇や紬</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="rylb">
<Property></Property>
<Property name="label">浜哄憳绫诲埆</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RYLB")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1100</Property>
+ <Property name="value">1100-鍏姟鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1200</Property>
+ <Property name="value">1200-浜嬩笟鍗曚綅绠＄悊浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1300</Property>
+ <Property name="value">1300-浼佷笟缁忚惀绠＄悊浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1400</Property>
+ <Property name="value">1400-涓撲笟鎶�鏈汉鍛�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1410</Property>
+ <Property name="value">1410-楂樼骇鑱岀О</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1411</Property>
+ <Property name="value">1411-姝ｉ珮绾ц亴绉�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1420</Property>
+ <Property name="value">1420-涓骇鑱岀О</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1430</Property>
+ <Property name="value">1430-鍒濈骇鍙婁互涓嬭亴绉�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1431</Property>
+ <Property name="value">1431-涓昏涓撹亴淇濈浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1432</Property>
+ <Property name="value">1432-涓昏涓撹亴妫�鍖栭獙浜哄憳</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1500</Property>
+ <Property name="value">1500-宸ヤ汉</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1510</Property>
+ <Property name="value">1510-鎶�鏈伐浜�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1511</Property>
+ <Property name="value">1511-楂樼骇鎶�甯�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1512</Property>
+ <Property name="value">1512-鎶�甯�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1513</Property>
+ <Property name="value">1513-楂樼骇宸�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1514</Property>
+ <Property name="value">1514-涓骇宸�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1515</Property>
+ <Property name="value">1515-鍒濈骇宸�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
</PropertyDef>
<PropertyDef name="zy">
@@ -129,16 +521,40 @@
</PropertyDef>
<PropertyDef name="qdzgzchzyzgsj">
<Property name="dataType">Date</Property>
- <Property name="label">鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿</Property>
+ <Property name="label">鑱屼笟璧勬牸鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="xl">
<Property></Property>
<Property name="label">瀛﹀巻</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("XL")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">0</Property>
+ <Property name="value">0-鐮旂┒鐢�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-澶у鏈</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-澶у涓撶</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-涓笓</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-楂樹腑鍙婁互涓�</Property>
+ </Entity>
+ </Collection>
+ </Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="zw">
<Property></Property>
@@ -158,14 +574,6 @@
</PropertyDef>
<PropertyDef name="userId">
<Property name="label">韬唤璇佸彿</Property>
- </PropertyDef>
- <PropertyDef name="start">
- <Property name="label">鍏ヨ亴鏃ユ湡锛堝紑濮嬶級</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="end">
- <Property name="label">鍏ヨ亴鏃ユ湡锛堢粨鏉燂級</Property>
- <Property name="dataType">Date</Property>
</PropertyDef>
</DataType>
</Model>
@@ -251,12 +659,6 @@
<Property name="exClassName">btn-normal</Property>
<Property name="iconClass">fa fa-search</Property>
</Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">view.get("#dsParam").flushAsync();</ClientEvent>
- <Property name="caption">閲嶇疆</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- <Property name="exClassName">btn-default</Property>
- </Button>
</Container>
</AutoForm>
<DataGrid id="dgMain">
@@ -267,12 +669,12 @@
<RowNumColumn>
<Property name="caption">搴忓彿</Property>
</RowNumColumn>
- <DataColumn name="lsbm">
- <Property name="property">lsbm</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="xm">
<Property name="property">xm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="lsbm">
+ <Property name="property">lsbm</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="xb">
@@ -295,22 +697,6 @@
<Property name="property">mz</Property>
<Property name="align">center</Property>
</DataColumn>
- <DataColumn name="rylb">
- <Property name="property">rylb</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="zy">
- <Property name="property">zy</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="qdzgzchzyzgsj">
- <Property name="property">qdzgzchzyzgsj</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="xl">
- <Property name="property">xl</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="zw">
<Property name="property">zw</Property>
<Property name="align">center</Property>
@@ -330,8 +716,8 @@
</Container>
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
- <Property name="caption">浠撳簱璁惧淇℃伅</Property>
- <Property name="width">80%</Property>
+ <Property name="caption">浜哄憳淇℃伅</Property>
+ <Property name="width">70%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Buttons>
<Button id="btnOk">
@@ -356,23 +742,23 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelAlign">left</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">lsbm</Property>
- <Property name="property">lsbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhdm</Property>
- <Property name="property">xzqhdm</Property>
- <Editor/>
- </AutoFormElement>
+ <Property name="labelWidth">120</Property>
<AutoFormElement>
<Property name="name">xm</Property>
<Property name="property">xm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sfzhm</Property>
+ <Property name="property">sfzhm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -381,8 +767,14 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">sfzhm</Property>
- <Property name="property">sfzhm</Property>
+ <Property name="name">lsbm</Property>
+ <Property name="property">lsbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhmc</Property>
+ <Property name="property">xzqhmc</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -476,5 +868,66 @@
<Property name="service">staffPR#delData</Property>
<Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
</AjaxAction>
+ <CustomDropDown id="ddFoodOrigin">
+ <Property name="minHeight">500</Property>
+ <Property name="assignmentMap">xzqhmc=name,xzqhdm=code</Property>
+ <Property name="minWidth">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsFoodOrigin">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="parameter"></Property>
+ <Property name="pageSize">30</Property>
+ </DataSet>
+ <Container layout="hbox regionPadding:5">
+ <TextEditor id="key2">
+ <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="width">200</Property>
+ </TextEditor>
+ <Button>
+ <ClientEvent name="onClick">var key = view.get("#key2.value");
+ view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="caption">纭畾</Property>
+ </Button>
+ </Container>
+ <DataGrid>
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ if(data){
+ view.get("#ddFoodOrigin").close(data.toJSON());
+ }</ClientEvent>
+ <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
+ arg.processDefault = true;</ClientEvent>
+ <Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="simple">
+ <Property name="property">simple</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <DataPilot layoutConstraint="bottom">
+ <Property name="dataSet">dsFoodOrigin</Property>
+ </DataPilot>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
diff --git a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
index fb1ba89..af05bdb 100644
--- a/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
+++ b/igds-protocol-bhzn/src/main/java/com/ld/igds/protocol/bhzn/ServerRunner.java
@@ -26,6 +26,7 @@
private BhznGrainV1ServerEngine bhznGrainServerEngine1;
@Autowired
private BhznVerbServerEngine bhznVerbServerEngine;
+
@Override
public void run(String... strings) throws Exception {
@@ -36,12 +37,12 @@
if (configData.getActive().indexOf("pro") >= 0) {
//寰愰椈鏈嶅姟鍣ㄤ娇鐢�
- bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
+// bhznGrainServerEngine1.start(BhznGrainV1ServerEngine.PORT);
- //姹熻タ璧ｅ窞銆佸箍涓滈珮宸炰娇鐢�
-// bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
+ //姹熻タ璧ｅ窞銆佸箍涓滈珮宸炰娇鐢ㄣ�佽タ钘忓北鍗椼�佸畞澶忕煶鍢村北銆佸箍涓滀經灞�
+ bhznGrainServerEngine2.start(BhznGrainV2ServerEngine.PORT);
//骞夸笢楂樺窞浣跨敤
- // bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
+ bhznVerbServerEngine.start(BhznVerbServerEngine.PORT);
return;
}
if (configData.getActive().indexOf("dev") >= 0) {
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java
index 045e470..f34431c 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java
+++ b/igds-recir/src/main/java/com/ld/igds/drug/service/HDrugService.java
@@ -14,6 +14,7 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -86,14 +87,12 @@
if (null == data.getDeptId()) {
data.setDeptId(ContextUtil.subDeptId(null));
}
- DefaultDept dept = sysDeptService.getDeptById(data.getDeptId());
- data.setDeptName(dept.getName());
Session session = this.getSessionFactory().openSession();
data.setUpdateTime(new Date());
data.setUpdateUser(ContextUtil.getLoginUserCName());
try {
if (null == data.getId()) {
- String id = createId(data.getCompanyId(), data.getDeptId());
+ String id = createId(data.getCompanyId(), data.getCgrq());
data.setId(id);
session.save(data);
} else {
@@ -184,26 +183,27 @@
}
- public String createId(String companyId, String deptId) {
+ public String createId(String companyId, Date time) {
+ String timeKey = DateFormatUtils.format(time, "yyyyMMdd");
// 浠庣紦瀛樹腑鑾峰彇宸叉湁鐨勭粍缁囩紪鐮�
String cacheKey = RedisConst.buildKey(companyId, HDrugService.CACHE_DRUG_ID);
String cacheId = (String) redisUtil.get(cacheKey);
- if (null != cacheId && cacheId.indexOf(deptId) >= 0) {
+ if (null != cacheId && cacheId.indexOf(timeKey) >= 0) {
String temp = cacheId.substring(cacheId.length() - 3);
Integer i = Integer.valueOf(temp);
- cacheId = deptId + String.format("%03d", ++i);
+ cacheId = timeKey + String.format("%03d", ++i);
} else {
List<Drug> result = listDrug(companyId, null);
if (null == result || result.size() == 0) {
- cacheId = deptId + "001";
+ cacheId = timeKey + "001";
} else {
Drug drug = result.get(0);
String temp = drug.getId().substring(drug.getId().length() - 3);
Integer i = Integer.valueOf(temp);
- cacheId = deptId + String.format("%03d", ++i);
+ cacheId = timeKey + String.format("%03d", ++i);
}
}
// 鏇存柊缂撳瓨
diff --git a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
index 8c8e321..e98aacb 100644
--- a/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
+++ b/igds-recir/src/main/java/com/ld/igds/drug/view/DrugLog.view.xml
@@ -441,6 +441,73 @@
<Property name="label">鐔忚捀浣滀笟浜哄憳</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtPest">
+ <Property name="creationType">com.ld.igds.models.Pest</Property>
+ <PropertyDef name="batchId">
+ <Property/>
+ <Property name="label">鎵规ID</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property/>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property/>
+ <Property name="label">浠撳簱ID</Property>
+ </PropertyDef>
+ <PropertyDef name="pestMax">
+ <Property name="dataType">int</Property>
+ <Property name="label">鏈�澶氭暟閲�</Property>
+ </PropertyDef>
+ <PropertyDef name="method">
+ <Property/>
+ <Property name="label">铏妫�娴嬫柟娉�</Property>
+ </PropertyDef>
+ <PropertyDef name="position">
+ <Property/>
+ <Property name="label">鍙戠敓閮ㄤ綅</Property>
+ </PropertyDef>
+ <PropertyDef name="pestType">
+ <Property/>
+ <Property name="label">铏绉嶇被</Property>
+ </PropertyDef>
+ <PropertyDef name="pestLevel">
+ <Property/>
+ <Property name="label">铏伯绛夌骇鍒ゅ畾</Property>
+ </PropertyDef>
+ <PropertyDef name="pestAnalysis">
+ <Property/>
+ <Property name="label">瀹宠櫕鎶楄嵂鎬у垎鏋�</Property>
+ </PropertyDef>
+ <PropertyDef name="pestStart">
+ <Property name="dataType">int</Property>
+ <Property name="label">铏閲囬泦鐐瑰紑濮�</Property>
+ </PropertyDef>
+ <PropertyDef name="pestEnd">
+ <Property name="dataType">int</Property>
+ <Property name="label">铏閲囬泦鐐规埅鑷�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkNum">
+ <Property name="dataType">int</Property>
+ <Property name="label">閲囬泦閫氶亾涓暟</Property>
+ </PropertyDef>
+ <PropertyDef name="receiveDate">
+ <Property name="dataType">Date</Property>
+ <Property name="label">妫�娴嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="points">
+ <Property/>
+ <Property name="label">閲囬泦鐐逛俊鎭�</Property>
+ </PropertyDef>
+ <PropertyDef name="checkUser">
+ <Property/>
+ <Property name="label">妫�娴嬩汉</Property>
+ </PropertyDef>
+ <PropertyDef name="remark">
+ <Property/>
+ <Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ </DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<Property name="packages">font-awesome,css-common</Property>
@@ -622,6 +689,7 @@
<AutoFormElement>
<Property name="name">pestBatchId</Property>
<Property name="property">pestBatchId</Property>
+ <Property name="trigger">cddPest</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -951,5 +1019,46 @@
<Property name="items">鐗囧墏,娉ㄥ皠鍓�,涔冲墏,涓稿墏,棰楃矑鍓�,鍏朵粬</Property>
<Property name="autoOpen">true</Property>
</ListDropDown>
+ <CustomDropDown id="cddPest">
+ <ClientEvent name="onOpen">var key = view.get("#dsMain.data:#").get("depotId");
+console.log(key)
+view.get("#dsPest").set("parameter",{depotId:key}).flushAsync();</ClientEvent>
+ <Property name="width">500</Property>
+ <Property name="assignmentMap">pestBatchId=batchId</Property>
+ <Property name="height">500</Property>
+ <Property name="maxHeight">500</Property>
+ <Property name="minHeight">500</Property>
+ <Container layout="regionPadding:5">
+ <DataSet id="dsPest">
+ <Property name="dataType">[dtPest]</Property>
+ <Property name="dataProvider">pestDataPR#getDataReport</Property>
+ <Property name="pageSize">10</Property>
+ </DataSet>
+ <Container>
+ <Property name="exClassName">bg-color</Property>
+ <DataGrid id="dgPest" layoutConstraint="top">
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsPest.data:#");
+if(data){
+ view.get("#cddPest").close(data.toJSON());
+}</ClientEvent>
+ <Property name="dataSet">dsPest</Property>
+ <Property name="readOnly">true</Property>
+ <DataColumn name="batchId">
+ <Property name="property">batchId</Property>
+ </DataColumn>
+ <DataColumn name="receiveDate">
+ <Property name="property">receiveDate</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ <Container layoutConstraint="bottom">
+ <Property name="exClassName">bg-color</Property>
+ <DataPilot layoutConstraint="right">
+ <Property name="dataSet">dsPest</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </Container>
+ </Container>
+ </CustomDropDown>
</View>
</ViewConfig>
diff --git a/igds-recir/src/main/java/com/ld/igds/models/Drug.java b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
index b15da85..ce55d28 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/Drug.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/Drug.java
@@ -26,15 +26,13 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鑽墏缂栧彿", description = "搴撳尯浠ｇ爜+涓変綅椤哄簭鍙�")
+ @PropertyDef(label = "鑽墏缂栧彿", description = "閲囪喘鏃ユ湡(yyyyMMdd)+涓変綅椤哄簭鍙�")
private String id;
- @Id
@Column(name = "DEPT_ID_", length = 50)
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
- @Id
@Column(name = "cgrq")
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
index 63f37bf..76f75f2 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLog.java
@@ -25,7 +25,7 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿", description = "浠撴埧浠ｇ爜+浣滀笟鏃ユ湡 (yyyyMMdd) +3 浣嶉『搴忓彿")
+ @PropertyDef(label = "鐔忚捀浣滀笟鍗曞彿", description = "浣滀笟鏃ユ湡 (yyyyMMdd) +3 浣嶉『搴忓彿")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
diff --git a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
index 2535004..9f57859 100644
--- a/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
+++ b/igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml
@@ -141,6 +141,10 @@
<Property></Property>
<Property name="label">rtsp鍦板潃</Property>
</PropertyDef>
+ <PropertyDef name="phoneAddr">
+ <Property></Property>
+ <Property name="label">鎵嬫満鍦板潃</Property>
+ </PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞璇存槑</Property>
@@ -192,70 +196,6 @@
<Entity>
<Property name="code">Y</Property>
<Property name="name">鑷姩鎶撴媿</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="azwzlx">
- <Property></Property>
- <Property name="label">瀹夎浣嶇疆</Property>
- <Property name="mapping">
- <Property name="keyProperty">key</Property>
- <Property name="valueProperty">value</Property>
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="key">01</Property>
- <Property name="value">绮簱澶ч棬</Property>
- </Entity>
- <Entity>
- <Property name="key">02</Property>
- <Property name="value">鎵︽牱鏈�</Property>
- </Entity>
- <Entity>
- <Property name="key">03</Property>
- <Property name="value">鍖栭獙瀹�</Property>
- </Entity>
- <Entity>
- <Property name="key">04</Property>
- <Property name="value">缁撶畻瀹�</Property>
- </Entity>
- <Entity>
- <Property name="key">05</Property>
- <Property name="value">鍦扮鎴�</Property>
- </Entity>
- <Entity>
- <Property name="key">06</Property>
- <Property name="value">搴撳尯涓诲共閬�</Property>
- </Entity>
- <Entity>
- <Property name="key">07</Property>
- <Property name="value">浠撻棿鐩戞帶</Property>
- </Entity>
- <Entity>
- <Property name="key">08</Property>
- <Property name="value">浠撳唴</Property>
- </Entity>
- <Entity>
- <Property name="key">09</Property>
- <Property name="value">鑽搧搴�</Property>
- </Entity>
- <Entity>
- <Property name="key">10</Property>
- <Property name="value">鍣ㄦ潗搴�</Property>
- </Entity>
- <Entity>
- <Property name="key">11</Property>
- <Property name="value">鍒堕珮鐐�</Property>
- </Entity>
- <Entity>
- <Property name="key">12</Property>
- <Property name="value">鍛ㄧ晫</Property>
- </Entity>
- <Entity>
- <Property name="key">99</Property>
- <Property name="value">鍏朵粬</Property>
</Entity>
</Collection>
</Property>
@@ -627,11 +567,10 @@
</DataGrid>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:5">
- <Property name="width">800</Property>
+ <Property name="width">75%</Property>
<Property name="caption">鐩戞帶璁惧淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
- <Property name="height">100%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
@@ -661,7 +600,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -696,11 +635,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">azwzlx</Property>
- <Property name="property">azwzlx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">spjklx</Property>
<Property name="property">spjklx</Property>
<Editor/>
@@ -719,10 +653,26 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
+ <AutoFormElement>
+ <Property name="name">screenShow</Property>
+ <Property name="property">screenShow</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">榛樿灞曠ず</Property>
+ <Property name="value">Y</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">閫夋嫨灞曠ず</Property>
+ <Property name="value">N</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">snapTag</Property>
<Property name="property">snapTag</Property>
@@ -745,22 +695,6 @@
<Property name="color">blue</Property>
</Property>
</Label>
- <AutoFormElement>
- <Property name="name">screenShow</Property>
- <Property name="property">screenShow</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">榛樿灞曠ず</Property>
- <Property name="value">Y</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">閫夋嫨灞曠ず</Property>
- <Property name="value">N</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
@@ -793,7 +727,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelWidth">100</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
@@ -827,7 +761,7 @@
<Property name="property">portInC</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">mediaAddr</Property>
<Property name="property">mediaAddr</Property>
<Property name="trigger">triggerMedia</Property>
@@ -838,6 +772,11 @@
</Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">phoneAddr</Property>
+ <Property name="property">phoneAddr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
<Property name="editorType">TextArea</Property>
diff --git a/igds-warn/src/main/java/com/ld/igds/warn/service/HSecureManagerService.java b/igds-warn/src/main/java/com/ld/igds/warn/service/HSecureManagerService.java
new file mode 100644
index 0000000..d923703
--- /dev/null
+++ b/igds-warn/src/main/java/com/ld/igds/warn/service/HSecureManagerService.java
@@ -0,0 +1,105 @@
+package com.ld.igds.warn.service;
+
+import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.SecureManager;
+import com.ld.igds.util.ContextUtil;
+import com.ld.igds.util.DateUtil;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.hibernate.Session;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author czt
+ * @date 2023/10/30
+ **/
+@Component
+public class HSecureManagerService extends HibernateDao {
+
+
+ public void listData(Page<SecureManager> page, Map<String, Object> param) throws Exception {
+ StringBuffer hql = new StringBuffer();
+ hql.append(" from " + SecureManager.class.getName() + " where companyId =:companyId and deptId =:deptId ");
+ Map<String, Object> args = new HashMap<>();
+ args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
+
+ String count = "select count(*) " + hql.toString();
+ hql.append(" order by updateTime desc");
+ this.pagingQuery(page, hql.toString(), count, args);
+
+ }
+
+ public void saveData(SecureManager data) {
+ data.setUpdateTime(new Date());
+ data.setDeptId(ContextUtil.subDeptId(null));
+ data.setCompanyId(ContextUtil.getCompanyId());
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null == data.getFxdbm()) {
+ data.setFxdbm(DateFormatUtils.format(new Date(), "yyyyMMdd") + getIndex(data.getCompanyId()));
+
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
+
+ public String getIndex(String companyId) {
+ List<SecureManager> list = getDataByTime(companyId);
+ int index = 10000;
+ if (list != null && list.size() > 0) {
+ String id = list.get(0).getFxdbm().substring(8);
+ int temp = Integer.valueOf(id) + 1;
+ index += temp;
+ }else {
+ index ++;
+ }
+ return String.valueOf(index).substring(1);
+ }
+
+ private List<SecureManager> getDataByTime(String companyId) {
+ String hql = " from " + SecureManager.class.getName()
+ + " where companyId =:companyId ";
+
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", companyId);
+
+ hql += " and updateTime >:startTime";
+ args.put("startTime", DateUtil.getCurZero(new Date()));
+
+
+ hql += " and updateTime <:endTime";
+ args.put("endTime", DateUtil.getNextZero(new Date()));
+
+
+ hql += " order by id desc";
+
+ return this.query(hql, args);
+ }
+
+ public void delData(SecureManager data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getFxdbm()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
+
+}
diff --git a/igds-warn/src/main/java/com/ld/igds/warn/view/SecureManager.view.xml b/igds-warn/src/main/java/com/ld/igds/warn/view/SecureManager.view.xml
new file mode 100644
index 0000000..5c33d99
--- /dev/null
+++ b/igds-warn/src/main/java/com/ld/igds/warn/view/SecureManager.view.xml
@@ -0,0 +1,460 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ViewConfig>
+ <Arguments/>
+ <Context/>
+ <Model>
+ <DataType name="dtMain">
+ <Property name="creationType">com.ld.igds.models.SecureManager</Property>
+ <PropertyDef name="fxdbm">
+ <Property></Property>
+ <Property name="label">椋庨櫓鐐圭紪鐮�</Property>
+ <Property name="readOnly">true</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="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="dd">
+ <Property></Property>
+ <Property name="label">鍦扮偣</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="sbr">
+ <Property></Property>
+ <Property name="label">璇嗗埆浜�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="hjbw">
+ <Property></Property>
+ <Property name="label">鐜妭/閮ㄤ綅</Property>
+ </PropertyDef>
+ <PropertyDef name="fxxx">
+ <Property></Property>
+ <Property name="label">椋庨櫓淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="fxlx">
+ <Property name="label">椋庨櫓绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-鍩虹璁炬柦</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-缃戠粶瀹夊叏</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-娑堥槻瀹夊叏</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-鐢ㄧ數瀹夊叏</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">5</Property>
+ <Property name="value">5-浣滀笟瀹夊叏</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">6</Property>
+ <Property name="value">6-鐢ㄨ嵂椋庨櫓</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">7</Property>
+ <Property name="value">7-绠＄悊椋庨櫓</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">8</Property>
+ <Property name="value">8-鍏朵粬椋庨櫓</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="fxfj">
+ <Property name="label">椋庨櫓绛夌骇</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-浣庨闄�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-涓�鑸闄�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-杈冨ぇ椋庨櫓</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-閲嶅ぇ椋庨櫓</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="fxglcs">
+ <Property></Property>
+ <Property name="label">椋庨櫓绠℃帶鎺柦</Property>
+ </PropertyDef>
+ <PropertyDef name="yhxx">
+ <Property></Property>
+ <Property name="label">闅愭偅淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="yhpcxx">
+ <Property></Property>
+ <Property name="label">闅愭偅鎺掓煡淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="yhzgxx">
+ <Property></Property>
+ <Property name="label">闅愭偅鏁存敼淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="yhysxx">
+ <Property></Property>
+ <Property name="label">闅愭偅鏁存敼楠屾敹淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="sgjbxx">
+ <Property></Property>
+ <Property name="label">浜嬫晠鍩烘湰淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="zgsx">
+ <Property></Property>
+ <Property name="label">鏁存敼鏃堕檺</Property>
+ </PropertyDef>
+ <PropertyDef name="zrdw">
+ <Property></Property>
+ <Property name="label">璐ｄ换鍗曚綅</Property>
+ </PropertyDef>
+ <PropertyDef name="zrr">
+ <Property></Property>
+ <Property name="label">璐ｄ换浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="zgysxx">
+ <Property></Property>
+ <Property name="label">鏁存敼楠屾敹淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="fxgzjgzrr">
+ <Property name="label">椋庨櫓璺熻釜鐩戠璐ｄ换浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtParam">
+ <PropertyDef name="sbr">
+ <Property name="label">璇嗗埆浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="dd">
+ <Property name="label">鍦扮偣</Property>
+ </PropertyDef>
+ </DataType>
+ </Model>
+ <View layout="padding:5;regionPadding:5">
+ <Property name="packages">font-awesome,css-common</Property>
+ <DataSet id="dsMain">
+ <Property name="dataType">[dtMain]</Property>
+ <Property name="dataProvider">secureManagerPR#pageList</Property>
+ <Property name="pageSize">15</Property>
+ </DataSet>
+ <DataSet id="dsParam">
+ <ClientEvent name="onReady">self.insert({})
+</ClientEvent>
+ <Property name="dataType">[dtParam]</Property>
+ </DataSet>
+ <Container layout="regionPadding:10" layoutConstraint="top">
+ <Property name="exClassName">bg-color</Property>
+ <Property name="height">55</Property>
+ <Label layoutConstraint="left">
+ <Property name="text">鑿滃崟鏍忥細</Property>
+ </Label>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsMain").insert();
+view.get("#dialogMain").show();</ClientEvent>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-plus</Property>
+ <Property name="caption">鏂板</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var dialog= view.get("#dsMain.data:#");
+if(dialog){
+ view.get("#dialogMain").show();
+}else{
+ $alert("璇烽�変腑闇�瑕佷慨鏀圭殑鏁版嵁")
+}</ClientEvent>
+ <Property name="caption">缂栬緫</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">var cur = view.get("#dsMain.data:#");
+if(!cur) return;
+view.get("#ajaxDel").set("parameter",cur).execute(function(result){
+ if(result){
+ $alert(result);
+ return;
+ }else{
+ cur.remove();
+ }
+});</ClientEvent>
+ <Property name="exClassName">btn-warn</Property>
+ <Property name="iconClass">fa fa-pencil</Property>
+ <Property name="caption">鍒犻櫎</Property>
+ </Button>
+ </Container>
+ <Container>
+ <AutoForm>
+ <Property name="dataSet">dsParam</Property>
+ <Property name="cols">*,*,*,*</Property>
+ <AutoFormElement>
+ <Property name="name">sbr</Property>
+ <Property name="property">sbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dd</Property>
+ <Property name="property">dd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Container layout="regionPadding:10">
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">var param = view.get("#dsParam.data:#");
+view.get("#dsMain").set("parameter",param).flushAsync();</ClientEvent>
+ <Property name="caption">鏌ヨ</Property>
+ <Property name="exClassName">btn-normal</Property>
+ <Property name="iconClass">fa fa-search</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.get("#dsParam").insert({})</ClientEvent>
+ <Property name="caption">閲嶇疆</Property>
+ <Property name="iconClass">fa fa-refresh</Property>
+ <Property name="exClassName">btn-default</Property>
+ </Button>
+ </Container>
+ </AutoForm>
+ <DataGrid id="dgMain">
+ <ClientEvent name="onDataRowDoubleClick">view.get("#dialogMain").show();</ClientEvent>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <RowNumColumn/>
+ <DataColumn name="fxdbm">
+ <Property name="property">fxdbm</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="sbr">
+ <Property name="property">sbr</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="dd">
+ <Property name="property">dd</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="hjbw">
+ <Property name="property">hjbw</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="fxxx">
+ <Property name="property">fxxx</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="fxlx">
+ <Property name="property">fxlx</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="updateTime">
+ <Property name="property">updateTime</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ </DataGrid>
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="itemCodes">pageSize,pages</Property>
+ </DataPilot>
+ </ToolBar>
+ </Container>
+ <Dialog id="dialogMain">
+ <Property name="caption">鍩烘湰淇℃伅</Property>
+ <Property name="width">80%</Property>
+ <Property name="closeable">false</Property>
+ <Buttons>
+ <Button>
+ <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
+view.get("#uaAction").execute(function(result){
+ if(result){
+ $alert(result);
+ }else{
+ self.get("parent").hide();
+ }
+});</ClientEvent>
+ <Property name="caption">淇濆瓨</Property>
+ <Property name="iconClass">fa fa-check</Property>
+ <Property name="exClassName">btn-normal</Property>
+ </Button>
+ <Button>
+ <ClientEvent name="onClick">view.get("#dsMain.data:#").cancel();
+self.get("parent").hide();</ClientEvent>
+ <Property name="caption">鍙栨秷</Property>
+ <Property name="iconClass">fa fa-times</Property>
+ <Property name="exClassName">btn-warn</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">false</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelWidth">160</Property>
+ <AutoFormElement>
+ <Property name="name">fxdbm</Property>
+ <Property name="property">fxdbm</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">--绯荤粺鑷姩鐢熸垚--</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dd</Property>
+ <Property name="property">dd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sbr</Property>
+ <Property name="property">sbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hjbw</Property>
+ <Property name="property">hjbw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fxxx</Property>
+ <Property name="property">fxxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fxlx</Property>
+ <Property name="property">fxlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fxfj</Property>
+ <Property name="property">fxfj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fxglcs</Property>
+ <Property name="property">fxglcs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yhxx</Property>
+ <Property name="property">yhxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yhpcxx</Property>
+ <Property name="property">yhpcxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yhzgxx</Property>
+ <Property name="property">yhzgxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yhysxx</Property>
+ <Property name="property">yhysxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">sgjbxx</Property>
+ <Property name="property">sgjbxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zgsx</Property>
+ <Property name="property">zgsx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zrdw</Property>
+ <Property name="property">zrdw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zrr</Property>
+ <Property name="property">zrr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zgysxx</Property>
+ <Property name="property">zgysxx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fxgzjgzrr</Property>
+ <Property name="property">fxgzjgzrr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ <Tools/>
+ </Dialog>
+ <UpdateAction id="uaAction">
+ <Property name="successMessage">鎵ц鎴愬姛!</Property>
+ <Property name="dataResolver">secureManagerPR#saveData</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxDel">
+ <Property name="confirmMessage">纭畾瑕佸垹闄ゅ悧锛�</Property>
+ <Property name="service">secureManagerPR#delData</Property>
+ </AjaxAction>
+ <MonthDropDown id="monthDropDown1">
+ <ClientEvent name="onClose">var date = arg.selectedValue+1;
+if(date<10){
+ arg.selectedValue="0"+date
+}else if(date>=10){
+ arg.selectedValue=date
+}
+</ClientEvent>
+ </MonthDropDown>
+ </View>
+</ViewConfig>
diff --git a/igds-warn/src/main/java/com/ld/igds/warn/view/SecureManagerPR.java b/igds-warn/src/main/java/com/ld/igds/warn/view/SecureManagerPR.java
new file mode 100644
index 0000000..88889d4
--- /dev/null
+++ b/igds-warn/src/main/java/com/ld/igds/warn/view/SecureManagerPR.java
@@ -0,0 +1,53 @@
+package com.ld.igds.warn.view;
+
+import com.bstek.dorado.annotation.DataProvider;
+import com.bstek.dorado.annotation.DataResolver;
+import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
+import com.ld.igds.models.SecureManager;
+import com.ld.igds.warn.service.HSecureManagerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Map;
+
+/**
+ * @Author: czt
+ **/
+@Component
+public class SecureManagerPR {
+ @Autowired
+ private HSecureManagerService secureManagerService;
+
+ /**
+ * secureManagerPR#pageList
+ *
+ * @param page
+ * @param param
+ * @throws Exception
+ */
+ @DataProvider
+ public void pageList(Page<SecureManager> page, Map<String, Object> param) throws Exception {
+ secureManagerService.listData(page, param);
+ }
+
+ /**
+ * secureManagerPR#saveData
+ *
+ * @param data
+ */
+ @DataResolver
+ public void saveData(SecureManager data) {
+ secureManagerService.saveData(data);
+ }
+
+ /**
+ * secureManagerPR#delData
+ *
+ * @param data
+ */
+ @Expose
+ public void delData(SecureManager data) {
+ secureManagerService.delData(data);
+ }
+
+}
diff --git a/igds-web/pom.xml b/igds-web/pom.xml
index 63ea611..7809de5 100644
--- a/igds-web/pom.xml
+++ b/igds-web/pom.xml
@@ -144,12 +144,12 @@
</dependency>
- <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�
+ <!-- 鎺ュ彛鍖咃紝鍖呮嫭涓婃捣鎺ュ彛鍜屻�佹皵璞℃帴鍙ｃ�佷笁缁存帴鍙�-->
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-api-inte</artifactId>
<version>${igds.version}</version>
- </dependency>-->
+ </dependency>
<!-- 绉佹湁鍗忚-椋庢鑷磋繙-->
@@ -187,7 +187,7 @@
</dependency>-->
- <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満-->
+ <!-- 绉佹湁鍗忚-椋庢鑷磋繙IOT銆佸埗姘満
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-iot</artifactId>
@@ -202,7 +202,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
<!-- 绉佹湁鍗忚-璐濆崥绮儏-->
<dependency>
@@ -238,7 +238,7 @@
</exclusions>
</dependency>
- <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘-->
+ <!-- 绉佹湁鍗忚-閭︽捣鏅鸿兘
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-bhzn</artifactId>
@@ -253,9 +253,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
- <!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙-->
+ <!-- 绉佹湁鍗忚-姝ｆ潵鐢靛瓙
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-zldz</artifactId>
@@ -270,9 +270,9 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
- <!-- 娴峰悍杞︾墝璇嗗埆-SDK-->
+ <!-- 娴峰悍杞︾墝璇嗗埆-SDK
<dependency>
<groupId>com.ld.igds</groupId>
<artifactId>igds-protocol-sdk</artifactId>
@@ -287,7 +287,7 @@
<groupId>log4j</groupId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>-->
</dependencies>
<dependencyManagement>
diff --git a/igds-web/src/main/java/com/ld/igds/web/TestController.java b/igds-web/src/main/java/com/ld/igds/web/TestController.java
index 60afad7..1fbac0c 100644
--- a/igds-web/src/main/java/com/ld/igds/web/TestController.java
+++ b/igds-web/src/main/java/com/ld/igds/web/TestController.java
@@ -1,10 +1,16 @@
package com.ld.igds.web;
+import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* 娴嬭瘯浣跨敤
@@ -15,77 +21,100 @@
* @data:2019骞�12鏈�17鏃�
*/
@Controller
-@RequestMapping
+@RequestMapping("/test")
public class TestController {
+//
+// /**
+// * 鍗曠粍缁囧ぇ灞忚烦杞�
+// *
+// * @return
+// */
+// @RequestMapping("/test/grain-detail")
+// public ModelAndView singleScreen() {
+// // 鐢ㄦ埛淇℃伅
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/grainDetail");
+// return view;
+// }
+//
+// @RequestMapping("/test/print")
+// public ModelAndView testPrint() {
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/demoPrint");
+// return view;
+// }
+//
+// @RequestMapping("/test/print-check")
+// public ModelAndView testPrintCheck() {
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/demoCheckPrint");
+// return view;
+// }
+//
+// @RequestMapping("/test/inout/print/2019")
+// public ModelAndView testPrint2019() {
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/print-out-2019");
+// return view;
+// }
+//
+// @RequestMapping("/test/gas-print")
+// public ModelAndView testGasPrint() {
+// ModelAndView view = new ModelAndView();
+// view.setViewName("test/demoGasPrint");
+// return view;
+// }
+//
+// @RequestMapping("/test/demp")
+// public ModelAndView testDemo(
+// @RequestParam(name = "t", required = false) String t) {
+// ModelAndView view = new ModelAndView();
+//
+// String desc = "鈥︹�﹀姛鑳借皟璇曚腑鈥︹��";
+//
+// if (StringUtils.isNotEmpty(t)) {
+// if ("security-no".equals(t)) {
+// desc = "鈥︹�﹀緟涓夌淮妯″瀷鍥剧粯鍒跺畬鎴愬悗灞曠ず鈥︹��";
+// }
+// }
+// view.addObject("desc", desc);
+//
+// view.setViewName("test/demo");
+// return view;
+// }
+//
+// @RequestMapping("/test/no-access")
+// public ModelAndView testNoAccess(
+// @RequestParam(name = "t", required = false) String t) {
+// ModelAndView view = new ModelAndView();
+//
+// String desc = "鈥︹�︽偍娌℃湁鏉冮檺锛岃鑱旂郴绯荤粺绠＄悊鍛樷�︹��";
+// view.addObject("desc", desc);
+// view.setViewName("test/demo");
+// return view;
+// }
- /**
- * 鍗曠粍缁囧ぇ灞忚烦杞�
- *
- * @return
- */
- @RequestMapping("/test/grain-detail")
- public ModelAndView singleScreen() {
- // 鐢ㄦ埛淇℃伅
- ModelAndView view = new ModelAndView();
- view.setViewName("test/grainDetail");
- return view;
- }
- @RequestMapping("/test/print")
- public ModelAndView testPrint() {
- ModelAndView view = new ModelAndView();
- view.setViewName("test/demoPrint");
- return view;
- }
+ @RequestMapping("/IDCARD")
+ public @ResponseBody String testIDCARD(
+ @RequestParam(name = "t", required = false) String t , HttpServletRequest request, HttpServletResponse response) {
- @RequestMapping("/test/print-check")
- public ModelAndView testPrintCheck() {
- ModelAndView view = new ModelAndView();
- view.setViewName("test/demoCheckPrint");
- return view;
- }
-
- @RequestMapping("/test/inout/print/2019")
- public ModelAndView testPrint2019() {
- ModelAndView view = new ModelAndView();
- view.setViewName("test/print-out-2019");
- return view;
- }
-
- @RequestMapping("/test/gas-print")
- public ModelAndView testGasPrint() {
- ModelAndView view = new ModelAndView();
- view.setViewName("test/demoGasPrint");
- return view;
- }
-
- @RequestMapping("/test/demp")
- public ModelAndView testDemo(
- @RequestParam(name = "t", required = false) String t) {
- ModelAndView view = new ModelAndView();
-
- String desc = "鈥︹�﹀姛鑳借皟璇曚腑鈥︹��";
-
- if (StringUtils.isNotEmpty(t)) {
- if ("security-no".equals(t)) {
- desc = "鈥︹�﹀緟涓夌淮妯″瀷鍥剧粯鍒跺畬鎴愬悗灞曠ず鈥︹��";
- }
- }
- view.addObject("desc", desc);
-
- view.setViewName("test/demo");
- return view;
- }
-
- @RequestMapping("/test/no-access")
- public ModelAndView testNoAccess(
- @RequestParam(name = "t", required = false) String t) {
- ModelAndView view = new ModelAndView();
-
- String desc = "鈥︹�︽偍娌℃湁鏉冮檺锛岃鑱旂郴绯荤粺绠＄悊鍛樷�︹��";
- view.addObject("desc", desc);
- view.setViewName("test/demo");
- return view;
+// JSONObject content= new JSONObject();
+// JSONObject data = new JSONObject();
+ return "{\n" +
+ " \"address\": \"xxxxxxxxxxxxxxxxxx-17\",\n" +
+ " \"birthdate\": \"1996-12-01\",\n" +
+ " \"cnName\": \"璁稿浆\",\n" +
+ " \"effectedDate\": \"2014-04-02\",\n" +
+ " \"expiredDate\": \"2024-04-02\",\n" +
+ " \"folk\": \"姹塡",\n" +
+ " \"idNum\": \"510000000000000000\",\n" +
+ " \"issue\": \"瀹夐檰甯傚叕瀹夊眬\",\n" +
+ " \"nation\": \"涓浗\",\n" +
+ " \"sex\": \"鐢穃"\n" +
+ "}\n" +
+ "\n" +
+ "";
}
}
diff --git a/igds-web/src/main/resources/application-pro.yml b/igds-web/src/main/resources/application-pro.yml
index 1d4f61d..56c569c 100644
--- a/igds-web/src/main/resources/application-pro.yml
+++ b/igds-web/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢寰愰椈椤圭洰 ##########################
+########################## 瑗胯棌灞卞崡绮簱椤圭洰 ##########################
server:
port: 8888
context-path: /
@@ -15,12 +15,12 @@
url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
driver-class-name: com.mysql.jdbc.Driver
username: root
- password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
+ password: VoN6mGy94W/8BcVVpTsa+J2sjO4oBTDU25XkwdI2tJW4wj7ZOjuOHFonNaFcFoG3KfotN1M5p7mhxim8PkLcnw==
public-key:
config-decrypt: true
- initial-size: 5
- min-idle: 5
- max-active: 50
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
max-wait: 60000
time-between-eviction-runs-millis: 60000
min-evictable-idle-time-millis: 300000
@@ -51,7 +51,7 @@
database: 0
host: 127.0.0.1
port: 6379
- password: Abc123..
+ password: Redispwd..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
@@ -71,10 +71,10 @@
## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
igds:
default:
- companyId: 5322
+ companyId: 5333
sys-name: 鏅烘収绮簱绠＄悊绯荤粺
logo: logo-default.png
logo-title: logo-title-default.png
- support: 鏅烘収绮簱缁煎悎绠＄悊骞冲彴
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
grian-add-point: N
file-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/application-pro5303.yml b/igds-web/src/main/resources/application-pro5303.yml
index 9418919..bae5fe7 100644
--- a/igds-web/src/main/resources/application-pro5303.yml
+++ b/igds-web/src/main/resources/application-pro5303.yml
@@ -1,6 +1,7 @@
########################## 涓婃捣鍢夊畾 ##########################
server:
port: 8088
+# port: 8098 #涓婃捣4.0鐗堟湰婕旂ず-鏈湴閮ㄧ讲
context-path: /
connection-timeout: 5000
tomcat:
@@ -13,7 +14,7 @@
name: db-base
type: com.alibaba.druid.pool.DruidDataSource
url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
-# url: jdbc:mysql://192.168.200.3:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_master_4.0?useUnicode=true&characterEncoding=utf-8 #涓婃捣4.0鐗堟湰婕旂ず-鏈湴閮ㄧ讲
driver-class-name: com.mysql.jdbc.Driver
username: igds
password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==
diff --git a/igds-web/src/main/resources/application-pro5333.yml b/igds-web/src/main/resources/application-pro5333.yml
new file mode 100644
index 0000000..56c569c
--- /dev/null
+++ b/igds-web/src/main/resources/application-pro5333.yml
@@ -0,0 +1,80 @@
+########################## 瑗胯棌灞卞崡绮簱椤圭洰 ##########################
+server:
+ port: 8888
+ context-path: /
+ connection-timeout: 5000
+ tomcat:
+ uri-encoding: UTF-8
+
+########################## datasourcec ##########################
+spring:
+ datasource:
+ db-base:
+ name: db-base
+ type: com.alibaba.druid.pool.DruidDataSource
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: VoN6mGy94W/8BcVVpTsa+J2sjO4oBTDU25XkwdI2tJW4wj7ZOjuOHFonNaFcFoG3KfotN1M5p7mhxim8PkLcnw==
+ public-key:
+ config-decrypt: true
+ initial-size: 5
+ min-idle: 5
+ max-active: 50
+ max-wait: 60000
+ time-between-eviction-runs-millis: 60000
+ min-evictable-idle-time-millis: 300000
+ validation-query: select 1 from dual
+ test-whileIdle: true
+ test-on-borrow: false
+ test-on-return: false
+ pool-prepared-statements: true
+ max-pool-prepared-statement-per-connection-size: 20
+ filters: stat
+ connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+ use-global-data-source-stat: true
+ removeAbandoned: true
+ removeAbandonedTimeout: 90
+ logAbandoned: true
+ poolPreparedStatements: true
+ maxPoolPreparedStatementPerConnectionSize: 20
+ db-sqlite:
+ name: db-sqlite
+ url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db
+ driver-class-name: org.sqlite.JDBC
+ type: com.alibaba.druid.pool.DruidDataSource
+ username:
+ password:
+
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 0
+ host: 127.0.0.1
+ port: 6379
+ password: Redispwd..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+
+license:
+ subject: ld_license
+ publicAlias: publicCert
+ storePass: PUBLICFZZYXXJSGFYXGS888888
+ licensePath: D:/IGDS/license/license.lic
+ publicKeysStorePath: D:/IGDS/license/publicCerts.keystore
+
+########################## IGDS ##########################
+## 绯荤粺鎺ュ彛璺敱閰嶇疆 娉ㄦ剰鏁板瓧濡傛灉浠�0寮�澶寸殑璇濓紝鍚庡彴浼氬嚭鐜拌浆涔夛紝璇锋坊鍔�""
+igds:
+ default:
+ companyId: 5333
+ sys-name: 鏅烘収绮簱绠＄悊绯荤粺
+ logo: logo-default.png
+ logo-title: logo-title-default.png
+ support: 椋庢鑷磋繙淇℃伅鎶�鏈偂浠芥湁闄愬叕鍙�
+ grian-add-point: N
+ file-path: D:/IGDS/FILE/
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index bbc1403..47d1a88 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -362,7 +362,8 @@
title: '澶囨敞璇存槑',
align: 'center',
edit: 'text'
- }]]
+ }]],
+ limit: this.curCheckItems.length //鏄剧ず鐨勬暟閲�
});
$("thead tr").css({
@@ -490,6 +491,11 @@
//淇濆瓨鎻愪氦
function submit() {
+ console.log(curCheckData)
+ if (!curCheckData.sampleUser) {
+ layer.alert("璇峰厛鎵︽牱锛侊紒");
+ return;
+ }
if (curCheckData.checkStatus == "NONE" || curCheckData.checkStatus == "NONE2") {
layer.alert("璇风‘璁ゅ寲楠岀粨鏋滐紒锛�");
return;
@@ -500,6 +506,10 @@
}
if (!curCheckData.foodLevel) {
layer.alert("璇风‘璁ょ伯椋熺瓑绾э紒锛�");
+ return;
+ }
+ if (!curCheckData.foodType) {
+ layer.alert("璇风‘璁ょ伯椋熸�ц川锛侊紒");
return;
}
if (!curCheckData.price) {
@@ -617,7 +627,7 @@
}, {
field: 'registerTime',
title: '鐧昏鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
}, {
field: 'sampleStatus',
@@ -642,12 +652,26 @@
}, {
field: 'sampleTime',
title: '鎵︽牱鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
+ }, {
+ field: 'foodType',
+ title: '绮鎬ц川',
+ width: '9%',
+ templet: function (item) {
+ var result = item.foodType;
+ $.each(listFoodType, function (index, data) {
+ if (item.foodType == data.code) {
+ result = data.name;
+ return true;
+ }
+ });
+ return result == null ? "" : result;
+ }
}, {
field: 'foodVariety',
title: '绮鍝佺',
- width: '11%',
+ width: '9%',
templet: function (item) {
var result = item.foodVariety;
$.each(listFoodVariety, function (index, data) {
@@ -661,7 +685,7 @@
}, {
field: 'depotId',
title: '瑁呭嵏浠撳簱',
- width: '11%',
+ width: '10%',
templet: function (item) {
var result = item.depotId;
$.each(listDepot, function (index, data) {
diff --git a/igds-web/src/main/resources/static/admin/inout/in-weight.js b/igds-web/src/main/resources/static/admin/inout/in-weight.js
index 93b01f3..ef6d28e 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-weight.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-weight.js
@@ -255,7 +255,8 @@
}
function flushByHand() {
- flushData(null, null);
+ var intelCard = $("#intelCard").val();
+ flushData(intelCard, null);
}
function flushWeight() {
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-check.html b/igds-web/src/main/resources/templates/admin/inout/in-check.html
index 144956c..dbc2da0 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-check.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-check.html
@@ -350,6 +350,8 @@
var companyId = [[${loginUser.companyId}]];
//鍝佺
var listFoodVariety = [[${listFoodVariety}]];
+ //鎬ц川
+ var listFoodType = [[${listFoodType}]];
var startTime = [[${startTime}]];
var endTime = [[${endTime}]];
var foodYear = [[${foodYear}]];
@@ -515,25 +517,19 @@
</div>
</div>
</div>
- <!-- <div class="layui-col-xs4">-->
- <!-- <div class="layui-form-item">-->
- <!-- <label class="layui-form-label red">绮骞翠唤</label>-->
- <!-- <div class="layui-input-block">-->
- <!-- <input type="text" name="foodYear" placeholder="璇疯緭鍏�"-->
- <!-- class="layui-input rkbk-search-input bg-date" id="foodYear">-->
-
- <!-- </div>-->
- <!-- </div>-->
- <!-- </div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
+ <label class="layui-form-label red">绮鎬ц川</label>
<div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
+ <select id="foodType" name="foodType" lay-filter="select_foodType">
+ <option value=""></option>
+ <option th:each="dic,dicSet:${listFoodType}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
</div>
</div>
</div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label red">鍖栭獙缁撴灉</label>
@@ -546,6 +542,15 @@
</div>
</div>
</div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs12" style="margin-bottom: 10px">
<div style="padding-left: 50px; color: #2ab5ad;">
<span style="font-weight: bold; margin-right: 10px;">澶囨敞璇存槑锛�1.缁撴灉鍒ゅ畾锛氱郴缁熸牴鎹悇鍖栭獙椤圭粨鏋滃垽瀹氾紝鏈�鍚庡寲楠岀粨鏋滈渶鎵嬪姩閫夋嫨纭锛�2.鏍哥畻瀹氫环锛氭牴鎹寲楠岄」閰嶇疆璁＄畻鐩稿叧澧炴墸浠凤紝鏈�鍚庡崟浠烽渶鎵嬪姩纭銆�</span>
diff --git a/igds-web/src/main/resources/templates/index/index-5303.html b/igds-web/src/main/resources/templates/index/index-5303.html
index 9607dd1..31b9ac7 100644
--- a/igds-web/src/main/resources/templates/index/index-5303.html
+++ b/igds-web/src/main/resources/templates/index/index-5303.html
@@ -112,9 +112,9 @@
<P>鏅鸿兘姘旇皟</P>
</a>
</span> <span class="i-menu-item i-menu4 i-navBg4"> <a
- href="javascript:;" onclick="openByTag('hlxz')"> <i><img
+ href="javascript:;" onclick="openByTag('warn')"> <i><img
th:src="@{/static/images/i-icon-hlzx.png}"/></i>
- <P>鐜祦鐔忚捀</P>
+ <P>鏅鸿兘棰勮</P>
</a>
</span> <span class="i-menu-item i-menu5 i-navBg5">
<a href="javascript:;" onclick="openQuantity()"> <i><img
diff --git a/igds-web/src/main/resources/templates/index/index-5329.html b/igds-web/src/main/resources/templates/index/index-5329.html
index 7dff021..3cec265 100644
--- a/igds-web/src/main/resources/templates/index/index-5329.html
+++ b/igds-web/src/main/resources/templates/index/index-5329.html
@@ -111,7 +111,7 @@
<P>鏅鸿兘棰勮</P>
</a>
</span> <span class="i-menu-item i-menu5 i-navBg5">
- <a href="javascript:;" onClick="open3d()">
+ <a href="javascript:;" onClick="openHelp()">
<i><img th:src="@{/static/images/i-icon-help1.png}"/></i>
<P>甯姪涓績</P>
</a>
@@ -207,14 +207,15 @@
};
//鎵撳紑璐ㄩ噺妫�娴�
- // function open3d() {
- // if ("#" == threePath) {
- // window.open("#", "_self");
- // } else {
- // window.open(threePath, "_blank");
- // }
- // };
function open3d() {
+ if ("#" == threePath) {
+ window.open("#", "_self");
+ } else {
+ window.open(threePath, "_blank");
+ }
+ };
+
+ function openHelp() {
window.open("./basic/common/help-center", "_blank");
};
</script>
diff --git a/igds-web/src/main/resources/verb-conf.properties b/igds-web/src/main/resources/verb-conf.properties
index a00a976..8f648b8 100644
--- a/igds-web/src/main/resources/verb-conf.properties
+++ b/igds-web/src/main/resources/verb-conf.properties
@@ -191,4 +191,7 @@
verb.mapImg.5329_001.b=default_qyc_b.png
## 5330_001
verb.mapImg.5330_001.a=default_pfc2_a.png
-verb.mapImg.5330_001.b=default_pfc2_b.png
\ No newline at end of file
+verb.mapImg.5330_001.b=default_pfc2_b.png
+## 5333_001 \u5206\u5E93\u7F16\u7801
+verb.mapImg.5333_001.a=default_pfc2_a.png
+verb.mapImg.5333_001.b=default_pfc2_b.png
\ No newline at end of file
--
Gitblit v1.9.3