From 651dfb24aa82ea28e6348907bc02dc8c84a6e13f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 29 六月 2023 19:33:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 14
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml | 61 ++-
igds-web/src/main/resources/static/admin/inout/inout-print.js | 8
igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java | 13
igds-web/src/main/resources/static/admin/inout/in-handle.js | 46 ++
igds-web/src/main/resources/templates/admin/inout/in-card-back.html | 7
igds-inout/src/main/java/com/ld/igds/models/InoutContract.java | 308 +++++++++---------
igds-web/src/main/resources/templates/test/qualityReport01.html | 166 ++++++++++
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java | 3
igds-core/src/main/java/models/igds.model.xml | 12
igds-web/src/main/resources/templates/test/qualityReport02.html | 166 ++++++++++
igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java | 156 +++++----
12 files changed, 692 insertions(+), 268 deletions(-)
diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index ad7405b..7dd3e2f 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -194,12 +194,12 @@
<Property name="keyProperty">id</Property>
<Property name="valueProperty">name</Property>
</Property>
- <Property name="required">true</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="granaryId">
<Property></Property>
<Property name="label">鎵�灞炲粧闂�</Property>
- <Property name="required">true</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="depotType">
<Property></Property>
@@ -231,7 +231,7 @@
<Property name="dataType">Double</Property>
<Property name="label">瀹為檯鍌ㄩ噺</Property>
<Property name="displayFormat">#,##0 KG</Property>
- <Property name="required">true</Property>
+ <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="storeType">
<Property></Property>
@@ -1263,15 +1263,15 @@
<Property name="label">绫诲瀷</Property>
</PropertyDef>
<PropertyDef name="simple">
- <Property/>
+ <Property></Property>
<Property name="label">绠�鎷�</Property>
</PropertyDef>
<PropertyDef name="disabledTag">
- <Property/>
+ <Property></Property>
<Property name="label">鏄惁绂佺敤</Property>
</PropertyDef>
<PropertyDef name="remark">
- <Property/>
+ <Property></Property>
<Property name="label">澶囨敞淇℃伅</Property>
</PropertyDef>
</DataType>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
index c5f3c45..c14dd6d 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
@@ -8,8 +8,9 @@
/**
* 榛樿鍏ュ簱杩囩鍗�
*/
- public static String IN_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍏ュ簱杩囩鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><span class='sp1'>瀹屾垚鏃堕棿锛歝ompleteTime</span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3'width='37.5%'>customerName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3'width='37.5%'>deptName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>瑁呭嵏浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>姘村垎鎵ｉ噺(KG)</td><td>deWet</td><td>鏉傝川鎵ｉ噸(KG)</td><td>deImpurity</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td></tr><tr><td>澶囨敞</td><td colspan='3'>remark</td><td>鎬绘墸閲�(KG)</td><td>deSum</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細driverName</span></div><div style=\"text-align: left;font-size: 12px\"><span>娉細姘村垎鎵ｉ噸銆佹潅璐ㄦ墸閲嶄负璐熸暟鏃讹紝琛ㄧず澧為噸銆�</span></div></body></html>";
+// public static String IN_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>鍏ュ簱杩囩鍗�</title><style>body{text-align:center;padding:10px}.tit{margin:10px;font-size:24px;font-family:'瀹嬩綋';padding-top:15px}.div-tit{padding-top:10px}table{width:100%;border-right:1px solid;border-bottom:1px solid;font-size:14px}table td{border-left:1px solid;border-top:1px solid;height:38px}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1'>鐧昏鏃堕棿锛歳egisterTime</span><span class='sp1'>瀹屾垚鏃堕棿锛歝ompleteTime</span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3'width='37.5%'>customerName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3'width='37.5%'>deptName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>瑁呭嵏浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>姘村垎鎵ｉ噺(KG)</td><td>deWet</td><td>鏉傝川鎵ｉ噸(KG)</td><td>deImpurity</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td></tr><tr><td>澶囨敞</td><td colspan='3'>remark</td><td>鎬绘墸閲�(KG)</td><td>deSum</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細driverName</span></div><div style=\"text-align: left;font-size: 12px\"><span>娉細姘村垎鎵ｉ噸銆佹潅璐ㄦ墸閲嶄负璐熸暟鏃讹紝琛ㄧず澧為噸銆�</span></div></body></html>";
+ public static String IN_WEIGHT_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8'><title>鍏ュ簱杩囩鍗�</title><style>body {text-align: center;padding: 10px} .tit {margin: 10px;font-size: 24px;font-family: '瀹嬩綋';padding-top: 15px} .div-tit {padding-top: 10px} table {width: 100%;border-right: 1px solid;border-bottom: 1px solid;font-size: 14px} table td {border-left: 1px solid;border-top: 1px solid;height: 38px} .sp1 {width: 50%;float: left;padding-bottom: 10px} .sp2 {width: 25%;float: left;text-align: center}</style></head><body><h1 class='tit'>billTitle</h1><div id=\"print_main\" class='div-tit'><span class='sp1'>瀹屾垚鏃堕棿锛�<a>completeTime</a></span><span class='sp1'>鍗曞彿锛歴erId</span></div><table cellspacing='0' cellpadding='0'><tr><td width='12.5%'>鍙戣揣鍗曚綅</td><td colspan='3' width='37.5%'>customerName</td><td width='12.5%'>鏀惰揣鍗曚綅</td><td colspan='3' `width`='37.5%'>deptName</td></tr><tr><td width='12.5%'>鎵胯繍浜�</td><td width='12.5%'>driverName</td><td width='12.5%'>绮鍝佺</td><td width='12.5%'>foodVariety</td><td width='12.5%'>瑁呭嵏浠撳簱</td><td width='12.5%'>depotName</td><td width='12.5%'>绮浜у湴</td><td width='12.5%'>foodLocation</td></tr><tr><td>鎵胯繍杞︾墝</td><td>plateNum</td><td>姣涢噸(KG)</td><td>fullWeight</td><td>鐨噸(KG)</td><td>emptyWeight</td><td>鍑�閲�(KG)</td><td>netWeight</td></tr><tr><td>璐ㄦ鎵ｉ噸(KG)</td><td>deCheck</td><td>璐ㄦ澧為噸(KG)</td><td>addCheck</td><td>鍊间粨鎵ｉ噸(KG)</td><td>deHandle</td><td>鍏朵粬鎵ｉ噸(KG)</td><td>deOther</td></tr><tr><td>璐ㄦ缁撴灉</td><td colspan='3'>checkStatus</td><td>鍏ュ簱閲嶉噺(KG)</td><td>recordWeight</td><td>缁撶畻閲嶉噺(KG)</td><td>settleWeight</td></tr><tr><td>澶囨敞</td><td colspan='7'>remark</td></tr></table><div class='div-tit'><span class='sp2'>鍙哥鍛橈細</span><span class='sp2'>鐩戠鍛橈細</span><span class='sp2'>淇濈鍛橈細handleUser</span><span class='sp2'>鎵胯繍浜猴細driverName</span></div></br><div style=\"padding-top: 10px\"><span></span></div><div style=\"text-align: left;font-size: 12px\"><span>娉細</span></div><div style=\"text-align: left;font-size: 12px\"><span>1.鍑�閲�=姣涢噸-鐨噸锛涜川妫�澧炴墸閲嶆牴鎹川妫�璇︾粏濉啓锛�</span></div><div style=\"text-align: left;font-size: 12px\"><span>2.鍏ュ簱閲嶉噺=鍑�閲�-鎵ｉ噸锛涚粨绠楅噸閲�=鍏ュ簱閲嶉噺+璐ㄦ澧為噸锛�</span></div><div style=\"text-align: left;font-size: 12px\"><span>3.鐧借仈锛堝瓨鏍癸級锛岀孩鑱旓紙璁拌处锛夛紝榛勮仈锛堝鎴蜂繚鐣欙級</span></div></body></html>";
/**
* 榛樿鍑哄簱杩囩鍗�
*/
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
index 55829ea..44b2f13 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java
@@ -6,6 +6,7 @@
/**
* 绉伴噸鍗曚俊鎭皝瑁�
+ *
* @author chen
*/
@Data
@@ -57,6 +58,14 @@
private double emptyWeight = 0.0;
//鍑�閲�
private double netWeight = 0.0;
+ //璐ㄦ鎵ｉ噸
+ private double deCheck = 0.0;
+ //璐ㄦ澧為噸
+ private double addCheck = 0.0;
+ //璐ㄦ缁撴灉
+ private String checkStatus;
+ //鍏ュ簱閲嶉噺
+ private double recordWeight = 0.0;
//姘村垎澧炴墸閲�
private double deWet = 0.0;
//鏉傝川澧炴墸閲�
@@ -76,9 +85,9 @@
//缁撶畻閲嶉噺
private double settleWeight = 0.0;
//鍗曚环
- private String price ="";
+ private String price = "";
//澶у啓閲戦
- private String moneyName ="";
+ private String moneyName = "";
//澶囨敞
private String remark = "";
//淇濈鍛�
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
index 4abd844..99927be 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -116,6 +116,11 @@
htmlStr = htmlStr.replace("deImpurity", bill.getDeImpurity() + "");
htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");
+
+ htmlStr = htmlStr.replace("recordWeight", bill.getRecordWeight() + "");
+ htmlStr = htmlStr.replace("deCheck", bill.getDeCheck() + "");
+ htmlStr = htmlStr.replace("addCheck", bill.getAddCheck() + "");
+
htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");
htmlStr = htmlStr.replace("settleWeight",
new DecimalFormat("0").format(bill.getSettleWeight()));
@@ -127,6 +132,7 @@
htmlStr = htmlStr.replace("wet", bill.getWet() + "");
htmlStr = htmlStr.replace("impurity", bill.getImpurity() + "");
+ htmlStr = htmlStr.replace("checkStatus", bill.getCheckStatus());
htmlStr = htmlStr.replace("remark", bill.getRemark());
htmlStr = htmlStr.replace("moneyName", bill.getMoneyName());
@@ -300,11 +306,15 @@
bill.setFullWeight(data.getFullWeight());
bill.setEmptyWeight(data.getEmptyWeight());
bill.setNetWeight(data.getNetWeight());
+ bill.setDeCheck(data.getDeCheck());
+ bill.setAddCheck(data.getAddCheck());
+ bill.setRecordWeight(data.getRecordWeight());
+ bill.setCheckStatus(data.getCheckStatus().equals(InoutConstant.STATUS_PASS) ? "鍚堟牸" : "涓嶅悎鏍�");
// bill.setDeWet(data.getDeWet());
// bill.setDeImpurity(data.getDeImpurity());
-// bill.setDeHandle(data.getDeHandle());
-// bill.setDeOther(data.getDeOther());
+ bill.setDeHandle(data.getDeHandle());
+ bill.setDeOther(data.getDeOther());
// bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());
bill.setSettleWeight(data.getSettleWeight());
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
index 13a5496..30878f1 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java
@@ -16,88 +16,92 @@
@Component
public class HContractManageService extends HibernateDao {
- public void pageContract(Page<InoutContract> page, Map<String, Object> param)
- throws Exception {
- String hql = " from " + InoutContract.class.getName()
- + " where companyId =:companyId and deptId =:deptId";
+ public void pageContract(Page<InoutContract> page, Map<String, Object> param)
+ throws Exception {
+ String hql = " from " + InoutContract.class.getName()
+ + " 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));
+ Map<String, Object> args = new HashMap<String, Object>();
+ args.put("companyId", ContextUtil.getCompanyId());
+ args.put("deptId", ContextUtil.subDeptId(null));
- if (null != param) {
- String str = (String) param.get("type");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and type =:type";
- args.put("type", str);
- }
- str = (String) param.get("name");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and name like:name";
- args.put("name", "%" + str + "%");
- }
- str = (String) param.get("customerName");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and customerName like:customerName";
- args.put("customerName", "%" + str + "%");
- }
- Integer year = (Integer) param.get("year");
- if (null != year) {
- hql += " and year =:year";
- args.put("year", String.valueOf(year));
- }
- str = (String) param.get("key");
- if (StringUtils.isNotEmpty(str)) {
- hql += " and (name like :name or planName like:planName) ";
- args.put("name", "%" + str + "%");
- args.put("planName", "%" + str + "%");
- }
- }
+ if (null != param && param.size() != 0) {
+ String str = (String) param.get("type");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and type =:type";
+ args.put("type", str);
+ }
+ str = (String) param.get("name");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and name like:name";
+ args.put("name", "%" + str + "%");
+ }
+ str = (String) param.get("customerName");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and customerName like:customerName";
+ args.put("customerName", "%" + str + "%");
+ }
+ Integer year = (Integer) param.get("year");
+ if (null != year) {
+ hql += " and year =:year";
+ args.put("year", String.valueOf(year));
+ }
+ str = (String) param.get("key");
+ if (StringUtils.isNotEmpty(str)) {
+ hql += " and (name like :name or planName like:planName) ";
+ args.put("name", "%" + str + "%");
+ args.put("planName", "%" + str + "%");
+ }
+ }
- String count = "select count(*) " + hql;
- hql += " order by createTime desc";
+ String count = "select count(*) " + hql;
+ hql += " order by createTime desc";
- this.pagingQuery(page, hql, count, args);
- }
+ this.pagingQuery(page, hql, count, args);
+ }
- public void saveContract(InoutContract data) {
- if (StringUtils.isEmpty(data.getCompanyId())) {
- data.setCompanyId(ContextUtil.getCompanyId());
- }
- if(StringUtils.isEmpty(data.getDeptId())){
- data.setDeptId(ContextUtil.subDeptId(null));
- }
- Session session = this.getSessionFactory().openSession();
+ public void saveContract(InoutContract data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setDeptId(ContextUtil.subDeptId(null));
+ }
+ if (StringUtils.isEmpty(data.getCreateUser())) {
+ data.setCreateUser(ContextUtil.getLoginUserCName());
+ }
+ data.setUpdateTime(new Date());
+ Session session = this.getSessionFactory().openSession();
- try {
- if (null == data.getId()) {
- data.setId(InoutManageUtil.createContractId(data.getType()));
- data.setCreateTime(new Date());
- session.save(data);
- } else {
- session.update(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- }
+ try {
+ if (null == data.getId()) {
+ data.setId(InoutManageUtil.createContractId(data.getType()));
+ data.setCreateTime(new Date());
+ session.save(data);
+ } else {
+ session.update(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ }
- public String delContract(InoutContract data) {
- Session session = this.getSessionFactory().openSession();
- try {
- if (null != data.getId()) {
- session.delete(data);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- session.flush();
- session.close();
- }
- return null;
- }
+ public String delContract(InoutContract data) {
+ Session session = this.getSessionFactory().openSession();
+ try {
+ if (null != data.getId()) {
+ session.delete(data);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ session.flush();
+ session.close();
+ }
+ return null;
+ }
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
index ca7db91..09dfc76 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml
@@ -29,6 +29,14 @@
<Property></Property>
<Property name="label">瀹㈡埛鍚嶇О</Property>
</PropertyDef>
+ <PropertyDef name="type">
+ <Property name="label">鍚堝悓绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("contractManagePR#triggerContractType").getResult()}</Property>
+ </Property>
+ </PropertyDef>
</DataType>
<DataType name="dtMain">
<Property name="creationType">com.ld.igds.models.InoutContract</Property>
@@ -135,6 +143,7 @@
<Property name="label">鎬婚噾棰�</Property>
<Property name="displayFormat">#,###0.00 鍏�</Property>
<Property name="required">true</Property>
+ <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="contactAmount">
<Property name="dataType">Double</Property>
@@ -202,31 +211,31 @@
<Property name="label">澶囨敞璇存槑</Property>
</PropertyDef>
<PropertyDef name="fddbr">
- <Property/>
+ <Property></Property>
<Property name="label">娉曞畾浠ｈ〃浜�</Property>
</PropertyDef>
<PropertyDef name="txdz">
- <Property/>
+ <Property></Property>
<Property name="label">閫氳鍦板潃</Property>
</PropertyDef>
<PropertyDef name="yzbm">
- <Property/>
+ <Property></Property>
<Property name="label">閭斂缂栫爜</Property>
</PropertyDef>
<PropertyDef name="lxrxm">
- <Property/>
+ <Property></Property>
<Property name="label">鑱旂郴浜哄鍚�</Property>
</PropertyDef>
<PropertyDef name="lxrdh">
- <Property/>
+ <Property></Property>
<Property name="label">鑱旂郴鐢佃瘽</Property>
</PropertyDef>
<PropertyDef name="sfzh">
- <Property/>
+ <Property></Property>
<Property name="label">韬唤璇佸彿</Property>
</PropertyDef>
<PropertyDef name="dzyx">
- <Property/>
+ <Property></Property>
<Property name="label">鐢靛瓙淇＄</Property>
</PropertyDef>
<PropertyDef name="relEndTime">
@@ -250,23 +259,23 @@
<Property name="label">缁撶畻鎬婚噾棰�</Property>
</PropertyDef>
<PropertyDef name="jsyhtyzx">
- <Property/>
+ <Property></Property>
<Property name="label">缁撶畻涓庡悎鍚屼竴鑷存��</Property>
</PropertyDef>
<PropertyDef name="jsyhtbyzyy">
- <Property/>
+ <Property></Property>
<Property name="label">涓嶄竴鑷村師鍥�</Property>
</PropertyDef>
<PropertyDef name="auditUser">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃壒浜�</Property>
</PropertyDef>
<PropertyDef name="auditDate">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃壒鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="auditStatus">
- <Property/>
+ <Property></Property>
<Property name="label">瀹℃壒鐘舵��</Property>
</PropertyDef>
<PropertyDef name="wcrq">
@@ -278,7 +287,7 @@
<Property name="label">鏇存柊鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="hqzz">
- <Property/>
+ <Property></Property>
<Property name="label">璐ф潈缁勭粐</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
@@ -378,11 +387,6 @@
<Property name="dataType">[dtMain]</Property>
<Property name="dataProvider">contractManagePR#pageContract</Property>
<Property name="pageSize">15</Property>
- <Property name="parameter">
- <Entity>
- <Property name="type">1</Property>
- </Entity>
- </Property>
</DataSet>
<DataSet id="dsParam">
<Property name="dataType">dtParam</Property>
@@ -436,6 +440,11 @@
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">100</Property>
<AutoFormElement>
+ <Property name="property">type</Property>
+ <Property name="name">type</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">year</Property>
<Property name="property">year</Property>
<Property name="trigger">defaultYearDropDown</Property>
@@ -452,6 +461,9 @@
<Editor/>
</AutoFormElement>
<Container layout="regionPadding:15">
+ <Label layoutConstraint="left">
+ <Property name="text">鎿嶄綔鎸夐敭锛�</Property>
+ </Label>
<Button layoutConstraint="left">
<ClientEvent name="onClick">var param = view.get("#dsParam.data");
view.get("#dsMain").set("parameter",param.toJSON()).flushAsync();</ClientEvent>
@@ -460,8 +472,8 @@
<Property name="iconClass">fa fa-refresh</Property>
</Button>
<Button>
- <ClientEvent name="onClick">view.get("#dsParam").setData({type:'1'});
-view.get("#dsMain").set("parameter",{type:'1'}).flushAsync();</ClientEvent>
+ <ClientEvent name="onClick">view.get("#dsParam").setData({});
+view.get("#dsMain").set("parameter",{}).flushAsync();</ClientEvent>
<Property name="exClassName">btn-warn</Property>
<Property name="iconClass">fa fa-refresh</Property>
<Property name="caption">閲嶇疆</Property>
@@ -478,31 +490,40 @@
<RowNumColumn/>
<DataColumn name="name">
<Property name="property">name</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="type">
<Property name="property">type</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="year">
<Property name="property">year</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="customerName">
<Property name="property">customerName</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="money">
<Property name="property">money</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="contactAmount">
<Property name="property">contactAmount</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn>
<Property name="property">foodVariety</Property>
<Property name="name">foodVariety</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="createUser">
<Property name="property">createUser</Property>
+ <Property name="align">center</Property>
</DataColumn>
<DataColumn name="createTime">
<Property name="property">createTime</Property>
+ <Property name="align">center</Property>
</DataColumn>
</DataGrid>
</Container>
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java b/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java
index 5de7f0b..82fabe0 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutContract.java
@@ -20,207 +20,211 @@
@Table(name = "D_INOUT_CONTRACT")
public class InoutContract implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- @Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "ID_")
- private String id;
+ @Id
+ @Column(name = "ID_", length = 40)
+ @PropertyDef(label = "ID_")
+ private String id;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Column(name = "COMPANY_ID_", length = 10)
+ @PropertyDef(label = "缁勭粐缂栫爜")
+ private String companyId;
- @Column(name = "DEPT_ID_", length = 40)
- @PropertyDef(label = "搴撳尯缂栫爜")
- private String deptId;
+ @Column(name = "DEPT_ID_", length = 40)
+ @PropertyDef(label = "搴撳尯缂栫爜")
+ private String deptId;
- @Column(name = "NAME_", length = 50)
- @PropertyDef(label = "鍚堝悓鍚嶇О")
- private String name;
+ @Column(name = "NAME_", length = 50)
+ @PropertyDef(label = "鍚堝悓鍚嶇О")
+ private String name;
- @Column(name = "PLAN_ID_", length = 40)
- @PropertyDef(label = "璁″垝缂栫爜")
- private String planId;
+ @Column(name = "PLAN_ID_", length = 40)
+ @PropertyDef(label = "璁″垝缂栫爜")
+ private String planId;
- @Column(name = "PLAN_NAME_", length = 50)
- @PropertyDef(label = "璁″垝鍚嶇О")
- private String planName;
+ @Column(name = "PLAN_NAME_", length = 50)
+ @PropertyDef(label = "璁″垝鍚嶇О")
+ private String planName;
- @Column(name = "TYPE_", length = 10)
- @PropertyDef(label = "涓氬姟绫诲埆", description = "1:閿�鍞悎鍚� 2:閲囪喘鍚堝悓 3:浠ｅ偍鍚堝悓")
- private String type;
+ @Column(name = "TYPE_", length = 10)
+ @PropertyDef(label = "涓氬姟绫诲埆", description = "1:閿�鍞悎鍚� 2:閲囪喘鍚堝悓 3:浠ｅ偍鍚堝悓")
+ private String type;
- @Column(name = "CUSTOMER_TYPE_", length = 10)
- @PropertyDef(label = "瀹㈡埛绫诲瀷", description = "1:浼佷笟 2:涓汉")
- private String customerType;
+ @Column(name = "CUSTOMER_TYPE_", length = 10)
+ @PropertyDef(label = "瀹㈡埛绫诲瀷", description = "1:浼佷笟 2:涓汉")
+ private String customerType;
- @Column(name = "YEAR_", length = 10)
- @PropertyDef(label = "骞翠唤")
- private String year;
+ @Column(name = "YEAR_", length = 10)
+ @PropertyDef(label = "骞翠唤")
+ private String year;
- @Column(name = "CUSTOMER_ID_", length = 20)
- @PropertyDef(label = "绀句細淇＄敤鐮�", description = "濡傛灉鏄紒涓�=瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜")
- private String customerId;
+ @Column(name = "CUSTOMER_ID_", length = 20)
+ @PropertyDef(label = "绀句細淇＄敤鐮�", description = "濡傛灉鏄紒涓�=瀹㈡埛缁熶竴绀句細淇＄敤浠ｇ爜")
+ private String customerId;
- @Column(name = "CUSTOMER_NAME_", length = 50)
- @PropertyDef(label = "瀹㈡埛鍚嶇О")
- private String customerName;
+ @Column(name = "CUSTOMER_NAME_", length = 50)
+ @PropertyDef(label = "瀹㈡埛鍚嶇О")
+ private String customerName;
- @Column(name = "fddbr", length = 50)
- @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
- private String fddbr;
+ @Column(name = "fddbr", length = 50)
+ @PropertyDef(label = "娉曞畾浠ｈ〃浜�")
+ private String fddbr;
- @Column(name = "txdz", length = 200)
- @PropertyDef(label = "閫氳鍦板潃")
- private String txdz;
+ @Column(name = "txdz", length = 200)
+ @PropertyDef(label = "閫氳鍦板潃")
+ private String txdz;
- @Column(name = "yzbm", length = 6)
- @PropertyDef(label = "閭斂缂栫爜")
- private String yzbm;
+ @Column(name = "yzbm", length = 6)
+ @PropertyDef(label = "閭斂缂栫爜")
+ private String yzbm;
- @PropertyDef(label = "鑱旂郴浜哄鍚�")
- @Column(name = "lxrxm", length = 50)
- private String lxrxm;
+ @PropertyDef(label = "鑱旂郴浜哄鍚�")
+ @Column(name = "lxrxm", length = 50)
+ private String lxrxm;
- @PropertyDef(label = "鑱旂郴鐢佃瘽")
- @Column(name = "lxrdh", length = 20)
- private String lxrdh;
+ @PropertyDef(label = "鑱旂郴鐢佃瘽")
+ @Column(name = "lxrdh", length = 20)
+ private String lxrdh;
- @PropertyDef(label = "韬唤璇佸彿")
- @Column(name = "sfzh", length = 20)
- private String sfzh;
+ @PropertyDef(label = "韬唤璇佸彿")
+ @Column(name = "sfzh", length = 20)
+ private String sfzh;
- @PropertyDef(label = "鐢靛瓙淇＄")
- @Column(name = "dzyx", length = 50)
- private String dzyx;
+ @PropertyDef(label = "鐢靛瓙淇＄")
+ @Column(name = "dzyx", length = 50)
+ private String dzyx;
- @Column(name = "SIGNING_TIME_")
- @PropertyDef(label = "绛捐鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd")
- private Date signingTime;
+ @Column(name = "SIGNING_TIME_")
+ @PropertyDef(label = "绛捐鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd")
+ private Date signingTime;
- @Column(name = "SIGN_ADDRESS_", length = 100)
- @PropertyDef(label = "绛剧害鍦扮偣")
- private String signAddress;
+ @Column(name = "SIGN_ADDRESS_", length = 100)
+ @PropertyDef(label = "绛剧害鍦扮偣")
+ private String signAddress;
- @Column(name = "BEGIN_TIME_")
- @PropertyDef(label = "绾﹀畾寮�濮嬫椂闂�")
- private Date beginTime;
+ @Column(name = "BEGIN_TIME_")
+ @PropertyDef(label = "绾﹀畾寮�濮嬫椂闂�")
+ private Date beginTime;
- @Column(name = "END_TIME_")
- @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
- private Date endTime;
+ @Column(name = "END_TIME_")
+ @PropertyDef(label = "绾﹀畾瀹屾垚鏃堕棿")
+ private Date endTime;
- @Column(name = "REL_END_TIME_")
- @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
- private Date relEndTime;
+ @Column(name = "REL_END_TIME_")
+ @PropertyDef(label = "瀹為檯瀹屾垚鏃堕棿")
+ private Date relEndTime;
- @Column(name = "FOOD_VARIETY_", length = 20)
- @PropertyDef(label = "绮鍝佺")
- private String foodVariety;
+ @Column(name = "FOOD_VARIETY_", length = 20)
+ @PropertyDef(label = "绮鍝佺")
+ private String foodVariety;
- @Column(name = "FOOD_TYPE_", length = 20)
- @PropertyDef(label = "绮鎬ц川")
- private String foodType;
+ @Column(name = "FOOD_TYPE_", length = 20)
+ @PropertyDef(label = "绮鎬ц川")
+ private String foodType;
- @Column(name = "PRICE_")
- @PropertyDef(label = "鍚堝悓鍗曚环锛屽厓/鍚�")
- private Double price;
+ @Column(name = "PRICE_")
+ @PropertyDef(label = "鍚堝悓鍗曚环锛屽厓/鍚�")
+ private Double price;
- @Column(name = "MONEY_")
- @PropertyDef(label = "鍚堝悓鎬婚噾棰�", description = "鍗曚綅锛氬厓")
- private Double money;
+ @Column(name = "MONEY_")
+ @PropertyDef(label = "鍚堝悓鎬婚噾棰�", description = "鍗曚綅锛氬厓")
+ private Double money;
- @Column(name = "CONTRACT_AMOUNT_")
- @PropertyDef(label = "鍚堝悓鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
- private Double contactAmount;
+ @Column(name = "CONTRACT_AMOUNT_")
+ @PropertyDef(label = "鍚堝悓鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double contactAmount;
- @Column(name = "COMPLETE_NUM_")
- @PropertyDef(label = "灞ョ害鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
- private Double completeNum;
+ @Column(name = "COMPLETE_NUM_")
+ @PropertyDef(label = "灞ョ害鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
+ private Double completeNum;
- @Column(name = "lybzj")
- @PropertyDef(label = "灞ョ害淇濊瘉閲�", description = "鍗曚綅锛氬厓")
- private Double lybzj;
+ @Column(name = "lybzj")
+ @PropertyDef(label = "灞ョ害淇濊瘉閲�", description = "鍗曚綅锛氬厓")
+ private Double lybzj;
- @PropertyDef(label = "灞ョ害鐜�", description = "鍗曚綅锛�%")
- @Column(name = "lyl")
- private Double lyl;
+ @PropertyDef(label = "灞ョ害鐜�", description = "鍗曚綅锛�%")
+ @Column(name = "lyl")
+ private Double lyl;
- @Column(name = "jsjg")
- @PropertyDef(label = "缁撶畻浠锋牸锛屽厓/鍚�")
- private Double jsjg;
+ @Column(name = "jsjg")
+ @PropertyDef(label = "缁撶畻浠锋牸锛屽厓/鍚�")
+ private Double jsjg;
- @PropertyDef(label = "缁撶畻鎬婚噾棰�", description = "鍗曚綅锛氬厓")
- @Column(name = "jszje")
- private Double jszje;
+ @PropertyDef(label = "缁撶畻鎬婚噾棰�", description = "鍗曚綅锛氬厓")
+ @Column(name = "jszje")
+ private Double jszje;
- @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��", description = "1锛氱鍚� 2锛氫笉绗﹀悎")
- @Column(name = "jsyhtyzx", length = 1)
- private String jsyhtyzx;
+ @PropertyDef(label = "缁撶畻涓庡悎鍚屼竴鑷存��", description = "1锛氱鍚� 2锛氫笉绗﹀悎")
+ @Column(name = "jsyhtyzx", length = 1)
+ private String jsyhtyzx;
- @PropertyDef(label = "涓嶄竴鑷村師鍥�")
- @Column(name = "jsyhtbyzyy", length = 250)
- private String jsyhtbyzyy;
+ @PropertyDef(label = "涓嶄竴鑷村師鍥�")
+ @Column(name = "jsyhtbyzyy", length = 250)
+ private String jsyhtbyzyy;
- @Column(name = "CUSTOMER_BANK_", length = 10)
- @PropertyDef(label = "瀹㈡埛寮�鎴疯")
- private String customerBank;
+ @Column(name = "CUSTOMER_BANK_", length = 10)
+ @PropertyDef(label = "瀹㈡埛寮�鎴疯")
+ private String customerBank;
- @Column(name = "CUSTOMER_BANK_ACCOUNT_", length = 40)
- @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
- private String customerBankAccount;
+ @Column(name = "CUSTOMER_BANK_ACCOUNT_", length = 40)
+ @PropertyDef(label = "瀹㈡埛鏂硅处鍙�")
+ private String customerBankAccount;
- @Column(name = "CUSTOMER_SIGN_USER_", length = 50)
- @PropertyDef(label = "瀹㈡埛绛剧害浜�")
- private String customerSignUser;
+ @Column(name = "CUSTOMER_SIGN_USER_", length = 50)
+ @PropertyDef(label = "瀹㈡埛绛剧害浜�")
+ private String customerSignUser;
- @Column(name = "BANK_", length = 50)
- @PropertyDef(label = "鏈柟寮�鎴疯")
- private String bank;
+ @Column(name = "BANK_", length = 50)
+ @PropertyDef(label = "鏈柟寮�鎴疯")
+ private String bank;
- @Column(name = "BANK_ACCOUNT_", length = 40)
- @PropertyDef(label = "鏈柟璐﹀彿")
- private String bankAccount;
+ @Column(name = "BANK_ACCOUNT_", length = 40)
+ @PropertyDef(label = "鏈柟璐﹀彿")
+ private String bankAccount;
- @Column(name = "SIGN_USER_", length = 50)
- @PropertyDef(label = "鏈柟绛剧害浜�")
- private String signUser;
+ @Column(name = "SIGN_USER_", length = 50)
+ @PropertyDef(label = "鏈柟绛剧害浜�")
+ private String signUser;
- /**
- * --------瀹℃壒淇℃伅--------
- **/
+ @Column(name = "PAY_TYPE_", length = 6)
+ @PropertyDef(label = "鏀粯鏂瑰紡")
+ private String payType;
- @Column(name = "CREATE_USER_", length = 50)
- @PropertyDef(label = "鍒涘缓浜�")
- private String createUser;
+ /**
+ * --------瀹℃壒淇℃伅--------
+ **/
- @Column(name = "AUDIT_USER_", length = 50)
- @PropertyDef(label = "瀹℃壒浜�")
- private String auditUser;
+ @Column(name = "CREATE_USER_", length = 50)
+ @PropertyDef(label = "鍒涘缓浜�")
+ private String createUser;
- @Column(name = "AUDIT_DATE_")
- @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
- private String auditDate;
+ @Column(name = "AUDIT_USER_", length = 50)
+ @PropertyDef(label = "瀹℃壒浜�")
+ private String auditUser;
- @Column(name = "AUDIT_STATUS_", length = 10)
- @PropertyDef(label = "瀹℃壒鐘舵��")
- private String auditStatus;
+ @Column(name = "AUDIT_DATE_")
+ @PropertyDef(label = "瀹℃壒鏃堕棿", description = "鏍煎紡锛歽yyy-MM-dd HH:mm:ss")
+ private String auditDate;
- @Column(name = "CREATE_TIME_")
- @PropertyDef(label = "鍒涘缓鏃堕棿")
- private Date createTime;
+ @Column(name = "AUDIT_STATUS_", length = 10)
+ @PropertyDef(label = "瀹℃壒鐘舵��")
+ private String auditStatus;
- @Column(name = "wcrq")
- @PropertyDef(label = "瀹屾垚鏃堕棿")
- private Date wcrq;
+ @Column(name = "CREATE_TIME_")
+ @PropertyDef(label = "鍒涘缓鏃堕棿")
+ private Date createTime;
- @Column(name = "hqzz", length = 30)
- @PropertyDef(label = "璐ф潈缁勭粐")
- private String hqzz;
+ @Column(name = "wcrq")
+ @PropertyDef(label = "瀹屾垚鏃堕棿")
+ private Date wcrq;
- @Column(name = "UPDATE_TIME_")
- @PropertyDef(label = "鏇存柊鏃堕棿")
- private Date updateTime;
+ @Column(name = "hqzz", length = 30)
+ @PropertyDef(label = "璐ф潈缁勭粐")
+ private String hqzz;
+
+ @Column(name = "UPDATE_TIME_")
+ @PropertyDef(label = "鏇存柊鏃堕棿")
+ private Date updateTime;
}
diff --git a/igds-web/src/main/resources/static/admin/inout/in-handle.js b/igds-web/src/main/resources/static/admin/inout/in-handle.js
index 479ab57..1fd1bd7 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-handle.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-handle.js
@@ -201,6 +201,9 @@
// 琛ㄥ崟娓呯┖
function resetForm() {
$("#form-data")[0].reset();
+ $('#kccz-r-img1').removeAttr('src');
+ $('#kccz-r-img2').removeAttr('src');
+ $('#kccz-r-img3').removeAttr('src');
form.render();
recordData = null;
$("#text-param").val(null);
@@ -270,11 +273,11 @@
// 鑾峰彇鐓х墖
var files = [{
- fileName: snapData.fileName1
+ fileName: img1
}, {
- fileName: snapData.fileName2
+ fileName: img2
}, {
- fileName: snapData.fileName3
+ fileName: img3
}];
data.files = files;
@@ -286,16 +289,51 @@
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(data),
success: function (result) {
+ layer.close(index);
if (result.code != "0000") {
notify(result.msg, result.data);
} else {
notify("鏁版嵁鎻愪氦鎴愬姛", result.data);
}
- layer.close(index);
},
error: function () {
layer.close(index);
alertError("鎻愪氦澶辫触锛岃閲嶆柊灏濊瘯");
}
});
+}
+
+/**
+ * 寮瑰嚭鎻愰啋妗�
+ * @param msg 鎻愰啋淇℃伅
+ * @param data 鏁版嵁淇℃伅锛屽彲鑳戒负绌�
+ */
+function notify(msg, data) {
+ if (data) {
+ //璧嬪��
+ $("#resultMsg").text(msg);
+ $("#resultUserName").text(data.userName);
+ $("#resultPlateNum").text(data.plateNum);
+ if ("IN" == data.type) {
+ $("#resultType").text("鍏ュ簱-" + INOUT_PROGRESS_MSG(data.progress));
+ } else {
+ $("#resultType").text("鍑哄簱-" + INOUT_PROGRESS_MSG(data.progress));
+ }
+ $("#resultIntelCard").text(data.intelCard);
+
+ layer.open({
+ type: 1,
+ offset: ['150px', '200px'],
+ area: '450px;',
+ shade: 0.8,
+ id: 'dialog_notify_info',
+ btn: ['纭畾'],
+ content: $('#dialog-from-notify'),
+ yes: function (index) {
+ layer.closeAll();
+ }
+ });
+ } else {
+ layer.alert(msg, {offset: ['300px', '300px']});
+ }
}
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/inout-print.js b/igds-web/src/main/resources/static/admin/inout/inout-print.js
index 3b36a16..cf9a101 100644
--- a/igds-web/src/main/resources/static/admin/inout/inout-print.js
+++ b/igds-web/src/main/resources/static/admin/inout/inout-print.js
@@ -10,16 +10,20 @@
// 鍊间负2--妯悜鎵撳嵃锛屽浐瀹氱焊寮�;
// 鍊间负3--绾靛悜鎵撳嵃锛屽浐瀹氬搴︼紝楂樺害鎸夋墦鍗板唴瀹圭殑楂樺害鑷�傚簲;
LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.ADD_PRINT_HTM("10%", "10%", "100%", "100%", htmlStr);
LODOP.PREVIEW();
} else {
LODOP.PRINT_INIT("杩囩鍗�");
//LODOP.SET_PRINT_PAGESIZE(1, 0, '90mm', "A4");
- LODOP.SET_PRINT_PAGESIZE(1, 2100, 1400, "A4");
+ LODOP.SET_PRINT_PAGESIZE(1, '210mm', '140mm', "A4");
//LODOP.SET_PRINT_PAGESIZE(3, 2100, '45', "A4");
LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ //鎵撳嵃澶氫唤
+ // LODOP.SET_PRINT_COPIES(3);
LODOP.PREVIEW();
//LODOP.PRINT_DESIGN();
}
};
+
+
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-card-back.html b/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
index cd74c0e..b1cbd01 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-card-back.html
@@ -40,7 +40,7 @@
<div class="rkbk-quick fl">
<button class="rkbk-quick-btn layui-btn btn-green"
- onclick="submit()">
+ onclick="submitData()">
<i><img th:src="@{../../static/images/icon-ok.png}"/></i> 鏀跺崱鍑哄簱
</button>
</div>
@@ -204,7 +204,7 @@
<form class="layui-form" action="" id="form-data"
lay-filter="form-data">
<div class="layui-form-item display-none">
- <input type="text" name="id">
+ <input type="text" name="id">
</div>
<div class="layui-form-item display-none">
<input type="text" name="progress">
@@ -220,7 +220,8 @@
</div>
<div class="layui-form-item">
- <input type="button" value="璇诲崱鏌ヨ" class="rkbk-r-btn fr layui-btn" onclick="flushICCard()">
+ <input type="button" value="璇诲崱鏌ヨ" class="rkbk-r-btn fr layui-btn"
+ onclick="flushICCard()">
<label class="layui-form-label">鏅烘収鍗″彿</label>
<div class="layui-input-block">
<input type="text" name="intelCard" id="intelCard"
diff --git a/igds-web/src/main/resources/templates/test/qualityReport01.html b/igds-web/src/main/resources/templates/test/qualityReport01.html
new file mode 100644
index 0000000..ac0226e
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/qualityReport01.html
@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>璐ㄦ鎶ュ憡(绋昏胺)</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ padding-top: 10px
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }
+
+ .sp1 {
+ width: 33%;
+ float: left;
+ padding-bottom: 10px
+ }
+ </style>
+</head>
+<body><h1 class='tit'>璐ㄦ鎶ュ憡(绋昏胺)</h1>
+<div class='div-tit'><span class='sp1'></span><span class='sp1'></span><span
+ class='sp1'>鍗曞彿锛歴erId</span></div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td colspan='2' rowspan="5" `width`="15%">鏍峰搧淇℃伅</td>
+ <td width='14%'>鍗曚綅鍚嶇О</td>
+ <td colspan='2' `width`='28%'>customerName</td>
+ <td width='15%'>搴撳尯鍚嶇О</td>
+ <td colspan='2' `width`='28%'>deptName</td>
+ </tr>
+ <tr>
+ <td width='14%'>浠撴埧鍚嶇О</td>
+ <td width='14%'>depotName</td>
+ <td width='14%'>璐т綅鍚嶇О</td>
+ <td width='15%'>hwmc</td>
+ <td width='14%'>淇濈鍛�</td>
+ <td width='14%'>storeKeeperName</td>
+ </tr>
+ <tr>
+ <td>鍝佺</td>
+ <td>foodVariety</td>
+ <td>鎬ц川</td>
+ <td>foodType</td>
+ <td>浠撳唴绮鏁伴噺</td>
+ <td>foodNumber KG</td>
+ </tr>
+ <tr>
+ <td>浜у湴</td>
+ <td>foodLocation</td>
+ <td>绛夌骇</td>
+ <td>foodLevel</td>
+ <td>鐢熶骇骞撮檺</td>
+ <td>scnx</td>
+ </tr>
+ <tr>
+ <td>鏍峰搧鏁伴噺</td>
+ <td>checkNum</td>
+ <td>鏍峰搧浠ｈ〃鏁伴噺</td>
+ <td>foodNumber KG</td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td colspan='2'>妫�楠屽崟浣�</td>
+ <td colspan="6">unit</td>
+ </tr>
+ <tr>
+ <td colspan='2' rowspan="2">璐ㄦ浜哄憳</td>
+ <td>鎵︽牱鍛�</td>
+ <td>sampleUser</td>
+ <td>妫�楠屽憳</td>
+ <td>checkUser</td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>鎵︽牱鏃堕棿</td>
+ <td>sampleTime</td>
+ <td>妫�楠屾椂闂�</td>
+ <td>checkTime2</td>
+ <td>鎶ュ憡鍑哄叿鏃堕棿</td>
+ <td>bgcjsj</td>
+ </tr>
+ <tr>
+ <td rowspan="7">璐ㄦ缁撴灉</td>
+ <td rowspan="4">璐ㄩ噺鎸囨爣妫�楠�</td>
+ <td>鍝佺</td>
+ <td>foodVariety</td>
+ <td>鍑虹硻鐜囷紙%锛�</td>
+ <td>rough</td>
+ <td>绛夌骇</td>
+ <td>foodLevel</td>
+ </tr>
+ <tr>
+ <td>鏁寸簿绫崇巼锛�%锛�</td>
+ <td>C10_ST</td>
+ <td>鏉傝川锛�%锛�</td>
+ <td>C02_ST</td>
+ <td>姘村垎锛�%锛�</td>
+ <td>c_perWet</td>
+ </tr>
+ <tr>
+ <td>榛勭矑绫筹紙%锛�</td>
+ <td>C11_ST</td>
+ <td>璋峰绯欑背锛�%锛�</td>
+ <td>C12_ST</td>
+ <td>鑹叉辰銆佹皵鍛�</td>
+ <td>C16_ST</td>
+ </tr>
+ <tr>
+ <td>浜掓贩鐜囷紙%锛�</td>
+ <td>C13_ST</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td>鍌ㄥ瓨鍝佽川妫�楠�</td>
+ <td>鑴傝偑閰稿�硷紙mgKOH/100g锛�</td>
+ <td>C14_ST</td>
+ <td>鍝佸皾鍒嗗��</td>
+ <td>C15_ST</td>
+ <td>鑹叉辰銆佹皵鍛�</td>
+ <td>C16_ST</td>
+ </tr>
+ <tr>
+ <td rowspan="2">椋熷搧瀹夊叏妫�楠�</td>
+ <td>榛勬洸闇夋瘨绱� B1锛埼糶/kg锛�</td>
+ <td>C17_ST</td>
+ <td>閾咃紙mg/kg锛�</td>
+ <td>C18_ST</td>
+ <td>闀夛紙mg/kg锛�</td>
+ <td>C19_ST</td>
+ </tr>
+ <tr>
+ <td>姹烇紙渭g/kg锛�</td>
+ <td>C20_ST</td>
+ <td>鏃犳満鐮凤紙mg/kg锛�</td>
+ <td>C21_ST</td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td colspan="2">澶囨敞</td>
+ <td colspan="6">remark</td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/test/qualityReport02.html b/igds-web/src/main/resources/templates/test/qualityReport02.html
new file mode 100644
index 0000000..58b24d3
--- /dev/null
+++ b/igds-web/src/main/resources/templates/test/qualityReport02.html
@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+<html lang='zh-cn'>
+<head>
+ <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>
+ <title>璐ㄦ鎶ュ憡(foodVariety)</title>
+ <style>body {
+ text-align: center;
+ padding: 10px
+ }
+
+ .tit {
+ margin: 10px;
+ font-size: 24px;
+ font-family: '瀹嬩綋';
+ padding-top: 15px
+ }
+
+ .div-tit {
+ padding-top: 10px
+ }
+
+ table {
+ width: 100%;
+ border-right: 1px solid;
+ border-bottom: 1px solid;
+ font-size: 14px
+ }
+
+ table td {
+ border-left: 1px solid;
+ border-top: 1px solid;
+ height: 38px
+ }
+
+ .sp1 {
+ width: 33%;
+ float: left;
+ padding-bottom: 10px
+ }
+ </style>
+</head>
+<body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1>
+<div class='div-tit'><span class='sp1'></span><span class='sp1'></span><span
+ class='sp1'>鍗曞彿锛歴erId</span></div>
+<table cellspacing='0' cellpadding='0'>
+ <tr>
+ <td colspan='2' rowspan="5" `width`="15%">鏍峰搧淇℃伅</td>
+ <td width='14%'>鍗曚綅鍚嶇О</td>
+ <td colspan='2' `width`='28%'>customerName</td>
+ <td width='15%'>搴撳尯鍚嶇О</td>
+ <td colspan='2' `width`='28%'>deptName</td>
+ </tr>
+ <tr>
+ <td width='14%'>浠撴埧鍚嶇О</td>
+ <td width='14%'>depotName</td>
+ <td width='14%'>璐т綅鍚嶇О</td>
+ <td width='15%'>hwmc</td>
+ <td width='14%'>淇濈鍛�</td>
+ <td width='14%'>storeKeeperName</td>
+ </tr>
+ <tr>
+ <td>鍝佺</td>
+ <td>foodVariety</td>
+ <td>鎬ц川</td>
+ <td>foodType</td>
+ <td>浠撳唴绮鏁伴噺</td>
+ <td>foodNumber KG</td>
+ </tr>
+ <tr>
+ <td>浜у湴</td>
+ <td>foodLocation</td>
+ <td>绛夌骇</td>
+ <td>foodLevel</td>
+ <td>鐢熶骇骞撮檺</td>
+ <td>scnx</td>
+ </tr>
+ <tr>
+ <td>鏍峰搧鏁伴噺</td>
+ <td>checkNum</td>
+ <td>鏍峰搧浠ｈ〃鏁伴噺</td>
+ <td>foodNumber KG</td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td colspan='2'>妫�楠屽崟浣�</td>
+ <td colspan="6">unit</td>
+ </tr>
+ <tr>
+ <td colspan='2' rowspan="2">璐ㄦ浜哄憳</td>
+ <td>鎵︽牱鍛�</td>
+ <td>sampleUser</td>
+ <td>妫�楠屽憳</td>
+ <td>checkUser</td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td>鎵︽牱鏃堕棿</td>
+ <td>sampleTime</td>
+ <td>妫�楠屾椂闂�</td>
+ <td>checkTime2</td>
+ <td>鎶ュ憡鍑哄叿鏃堕棿</td>
+ <td>bgcjsj</td>
+ </tr>
+ <tr>
+ <td rowspan="7">璐ㄦ缁撴灉</td>
+ <td rowspan="4">璐ㄩ噺鎸囨爣妫�楠�</td>
+ <td>鍝佺</td>
+ <td>foodVariety</td>
+ <td>鍑虹硻鐜囷紙%锛�</td>
+ <td>rough</td>
+ <td>绛夌骇</td>
+ <td>foodLevel</td>
+ </tr>
+ <tr>
+ <td>鏁寸簿绫崇巼锛�%锛�</td>
+ <td>C10_ST</td>
+ <td>鏉傝川锛�%锛�</td>
+ <td>C02_ST</td>
+ <td>姘村垎锛�%锛�</td>
+ <td>c_perWet</td>
+ </tr>
+ <tr>
+ <td>榛勭矑绫筹紙%锛�</td>
+ <td>C11_ST</td>
+ <td>璋峰绯欑背锛�%锛�</td>
+ <td>C12_ST</td>
+ <td>鑹叉辰銆佹皵鍛�</td>
+ <td>C16_ST</td>
+ </tr>
+ <tr>
+ <td>浜掓贩鐜囷紙%锛�</td>
+ <td>C13_ST</td>
+ <td colspan="4"></td>
+ </tr>
+ <tr>
+ <td>鍌ㄥ瓨鍝佽川妫�楠�</td>
+ <td>鑴傝偑閰稿�硷紙mgKOH/100g锛�</td>
+ <td>C14_ST</td>
+ <td>鍝佸皾鍒嗗��</td>
+ <td>C15_ST</td>
+ <td>鑹叉辰銆佹皵鍛�</td>
+ <td>C16_ST</td>
+ </tr>
+ <tr>
+ <td rowspan="2">椋熷搧瀹夊叏妫�楠�</td>
+ <td>榛勬洸闇夋瘨绱� B1锛埼糶/kg锛�</td>
+ <td>C17_ST</td>
+ <td>閾咃紙mg/kg锛�</td>
+ <td>C18_ST</td>
+ <td>闀夛紙mg/kg锛�</td>
+ <td>C19_ST</td>
+ </tr>
+ <tr>
+ <td>姹烇紙渭g/kg锛�</td>
+ <td>C20_ST</td>
+ <td>鏃犳満鐮凤紙mg/kg锛�</td>
+ <td>C21_ST</td>
+ <td colspan="2"></td>
+ </tr>
+ <tr>
+ <td colspan="2">澶囨敞</td>
+ <td colspan="6">remark</td>
+ </tr>
+</table>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.3