From 585e878b169bdeb2bc8cc452b9d2e640d00caa6d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 04 七月 2023 09:00:35 +0800
Subject: [PATCH] 质检报告
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java | 99 +++++++--
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml | 2
igds-inout/src/main/java/models/inout.model.xml | 40 +++
igds-web/src/main/resources/templates/test/qualityReport03.html | 40 +--
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml | 2
igds-web/src/main/resources/templates/test/qualityReport04.html | 40 +--
igds-web/src/main/resources/templates/test/qualityReport01.html | 38 +--
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java | 8
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js | 176 ++++++++--------
igds-web/src/main/resources/templates/test/qualityReport02.html | 36 +-
igds-inout/src/main/java/com/ld/igds/m/view/InoutCustomer.view.xml | 75 ++++++-
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml | 3
12 files changed, 338 insertions(+), 221 deletions(-)
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 47491f9..08d75f9 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
@@ -22,19 +22,19 @@
/**
* 灏忛害鍖栭獙鍗�
*/
- public static String IN_CHECK_WHEAT = "<!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'>璐ㄦ鎶ュ憡(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=\"6\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹归噸锛坓/L锛�</td><td>bulkWeight</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>c_perWet</td></tr><tr><td>涓嶅畬鍠勭矑锛�%锛�</td><td>C04_ST</td><td>鐢熻娊绮掞紙%锛�</td><td>C05_ST</td><td>鐢熼湁绮掞紙%锛�</td><td>C06_ST</td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>闈㈢瓔鍚告按閲忥紙%锛�</td><td>C08_ST</td><td>鍝佸皾鍒嗗��</td><td>C15_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td rowspan=\"2\">椋熷搧瀹夊叏妫�楠�</td><td>鍛曞悙姣掞紙mg/kg锛�</td><td>C27_ST</td><td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td><td>C31_ST</td><td>閾咃紙mg/kg锛�</td><td>C18_ST</td></tr><tr><td>闀夛紙mg/kg锛�</td><td>C19_ST</td><td>姹烇紙渭g/kg锛�</td><td>C20_ST</td><td>鏃犳満鐮凤紙mg/kg锛�</td><td>C21_ST</td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table></body></html>";
+ public static String IN_CHECK_WHEAT = "<!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 {text-align: right;padding-top: 10px;padding-right: 20px;} 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'>缂栫爜锛歴erId</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>foodYear</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>checkTime</td><td>鎶ュ憡鍑哄叿鏃堕棿</td><td>bgcjsj</td></tr><tr><td rowspan=\"6\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹归噸锛坓/L锛�</td><td>C03_ST</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鑹叉辰姘斿懗</td><td>C06_ST</td><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>C01_ST</td></tr><tr><td>涓嶅畬鍠勭矑锛�%锛�</td><td>C04_ST</td><td>鐢熻娊绮掞紙%锛�</td><td>C35_ST</td><td>鐢熼湁绮掞紙%锛�</td><td>C29_ST</td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>闈㈢瓔鍚告按閲忥紙%锛�</td><td>C08_ST</td><td>鍝佸皾鍒嗗��</td><td>C07_ST</td><td>鑹叉辰姘斿懗</td><td>C06_ST</td></tr><tr><td rowspan=\"2\">椋熷搧瀹夊叏妫�楠�</td><td>鍛曞悙姣掞紙mg/kg锛�</td><td>C27_ST</td><td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td><td>C31_ST</td><td>閾咃紙mg/kg锛�</td><td>C32_ST</td></tr><tr><td>闀夛紙mg/kg锛�</td><td>C25_ST</td><td>姹烇紙渭g/kg锛�</td><td>C33_ST</td><td>鏃犳満鐮凤紙mg/kg锛�</td><td>C30_ST</td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table><div class='div-tit'></div></body></html>";
/**
* 绋昏胺鍖栭獙鍗�
*/
- public static String IN_CHECK_PADDY = "<!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>";
+ public static String IN_CHECK_PADDY = "<!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 {text-align: right;padding-top: 10px;padding-right: 20px;} 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}</style></head><body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1><div class='div-tit'>缂栫爜锛歴erId</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>foodYear</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>checkTime</td><td>鎶ュ憡鍑哄叿鏃堕棿</td><td>bgcjsj</td></tr><tr><td rowspan=\"7\">璐ㄦ缁撴灉</td><td rowspan=\"4\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>鍑虹硻鐜囷紙%锛�</td><td>C09_ST</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鏁寸簿绫崇巼锛�%锛�</td><td>C10_ST</td><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>C01_ST</td></tr><tr><td>榛勭矑绫筹紙%锛�</td><td>C11_ST</td><td>璋峰绯欑背锛�%锛�</td><td>C12_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C21_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>C07_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C21_ST</td></tr><tr><td rowspan=\"2\">椋熷搧瀹夊叏妫�楠�</td><td>榛勬洸闇夋瘨绱� B1锛埼糶/kg锛�</td><td>C28_ST</td><td>閾咃紙mg/kg锛�</td><td>C32_ST</td><td>闀夛紙mg/kg锛�</td><td>C25_ST</td></tr><tr><td>姹烇紙渭g/kg锛�</td><td>C34_ST</td><td>鏃犳満鐮凤紙mg/kg锛�</td><td>C30_ST</td><td colspan=\"2\"></td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table><div class='div-tit'></div></body></html>";
/**
* 鐜夌背鍖栭獙鍗�
*/
- public static String IN_CHECK_CORN = "<!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'>璐ㄦ鎶ュ憡(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=\"6\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹归噸锛坓/L锛�</td><td>bulkWeight</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>c_perWet</td></tr><tr><td>涓嶅畬鍠勭矑锛�%锛�</td><td>C04_ST</td><td>鐢熼湁绮掞紙%锛�</td><td>C06_ST</td><td>闇夊彉绮掞紙%锛�</td><td>C07_ST</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>鍛曞悙姣掞紙mg/kg锛�</td><td>C27_ST</td><td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td><td>C31_ST</td><td>閾咃紙mg/kg锛�</td><td>C18_ST</td></tr><tr><td>闀夛紙mg/kg锛�</td><td>C19_ST</td><td>姹烇紙渭g/kg锛�</td><td>C20_ST</td><td>鏃犳満鐮凤紙mg/kg锛�</td><td>C21_ST</td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table></body></html>";
+ public static String IN_CHECK_CORN = "<!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 {text-align: right;padding-top: 10px;padding-right: 20px;} 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}</style></head><body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1><div class='div-tit'>缂栫爜锛歴erId</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>foodYear</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>checkTime</td><td>鎶ュ憡鍑哄叿鏃堕棿</td><td>bgcjsj</td></tr><tr><td rowspan=\"6\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹归噸锛坓/L锛�</td><td>C03_ST</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鑹叉辰姘斿懗</td><td>C06_ST</td><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>C01_ST</td></tr><tr><td>涓嶅畬鍠勭矑锛�%锛�</td><td>C04_ST</td><td>鐢熼湁绮掞紙%锛�</td><td>C29_ST</td><td>闇夊彉绮掞紙%锛�</td><td>C15_ST</td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>鑴傝偑閰稿�硷紙mgKOH/100g锛�</td><td>C14_ST</td><td>鍝佸皾鍒嗗��</td><td>C15_ST</td><td>鑹叉辰姘斿懗</td><td>C06_ST</td></tr><tr><td rowspan=\"2\">椋熷搧瀹夊叏妫�楠�</td><td>鍛曞悙姣掞紙mg/kg锛�</td><td>C27_ST</td><td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td><td>C31_ST</td><td>閾咃紙mg/kg锛�</td><td>C32_ST</td></tr><tr><td>闀夛紙mg/kg锛�</td><td>C25_ST</td><td>姹烇紙渭g/kg锛�</td><td>C33_ST</td><td>鏃犳満鐮凤紙mg/kg锛�</td><td>C30_ST</td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table><div class='div-tit'></div></body></html>";
/**
* 澶ц眴鍖栭獙鍗�
*/
- public static String IN_CHECK_SOYBEAN = "<!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'>璐ㄦ鎶ュ憡(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=\"5\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹屾暣绮掔巼锛�%锛�</td><td>C22_ST</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>c_perWet</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td>鎹熶激绮掔巼锛�%锛�</td><td>C23_ST</td><td>鐑崯浼ょ矑锛�%锛�</td><td>C24_ST</td><td colspan=\"2\"></td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>绮楄剛鑲吀鍊硷紙mgKOH/100g锛�</td><td>C25_ST</td><td>鍝佸皾鍒嗗��</td><td>C15_ST</td><td>鑹叉辰銆佹皵鍛�</td><td>C16_ST</td></tr><tr><td>椋熷搧瀹夊叏妫�楠�</td><td>閾咃紙mg/kg锛�</td><td>C18_ST</td><td>闀夛紙mg/kg锛�</td><td>C19_ST</td><td colspan=\"2\"></td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table></body></html>";
+ public static String IN_CHECK_SOYBEAN = "<!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 {text-align: right;padding-top: 10px;padding-right: 20px;} 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}</style></head><body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1><div class='div-tit'>缂栫爜锛歴erId</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>foodYear</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>checkTime</td><td>鎶ュ憡鍑哄叿鏃堕棿</td><td>bgcjsj</td></tr><tr><td rowspan=\"5\">璐ㄦ缁撴灉</td><td rowspan=\"3\">璐ㄩ噺鎸囨爣妫�楠�</td><td>鍝佺</td><td>foodVariety</td><td>瀹屾暣绮掔巼锛�%锛�</td><td>C16_ST</td><td>绛夌骇</td><td>foodLevel</td></tr><tr><td>鏉傝川锛�%锛�</td><td>C02_ST</td><td>姘村垎锛�%锛�</td><td>C01_ST</td><td>鑹叉辰姘斿懗</td><td>C06_ST</td></tr><tr><td>鎹熶激绮掔巼锛�%锛�</td><td>C17_ST</td><td>鐑崯浼ょ矑锛�%锛�</td><td>C34_ST</td><td colspan=\"2\"></td></tr><tr><td>鍌ㄥ瓨鍝佽川妫�楠�</td><td>绮楄剛鑲吀鍊硷紙mgKOH/100g锛�</td><td>C18_ST</td><td>鍝佸皾鍒嗗��</td><td>C07_ST</td><td>鑹叉辰姘斿懗</td><td>C06_ST</td></tr><tr><td>椋熷搧瀹夊叏妫�楠�</td><td>閾咃紙mg/kg锛�</td><td>C32_ST</td><td>闀夛紙mg/kg锛�</td><td>C25_ST</td><td colspan=\"2\"></td></tr><tr><td colspan=\"2\">澶囨敞</td><td colspan=\"6\">remark</td></tr></table><div class='div-tit'></div></body></html>";
/**
* 榛樿缁撶畻鍗�
*/
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 86003d3..39ad1ad 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
@@ -5,6 +5,7 @@
import com.ld.igds.check.service.CoreCheckStandardService;
import com.ld.igds.common.CoreCommonService;
import com.ld.igds.common.bar.BarCodeUtils;
+import com.ld.igds.constant.FoodLevel;
import com.ld.igds.constant.FoodVariety;
import com.ld.igds.inout.InoutBill;
import com.ld.igds.inout.InoutConstant;
@@ -343,13 +344,13 @@
String mark = data.getFoodVariety().substring(0, 3);
// 璋冩暣妯＄増鏁版嵁骞惰繑鍥�
String htmlStr = "";
- if (mark == FoodVariety.FOOD_VARIETY_WHEAT) {
+ if (FoodVariety.FOOD_VARIETY_WHEAT.equals(mark)) {
htmlStr = InoutBill.IN_CHECK_WHEAT;
- } else if (mark == FoodVariety.FOOD_VARIETY_PADDY) {
+ } else if (FoodVariety.FOOD_VARIETY_PADDY.equals(mark)) {
htmlStr = InoutBill.IN_CHECK_PADDY;
- } else if (mark == FoodVariety.FOOD_VARIETY_CORN) {
+ } else if (FoodVariety.FOOD_VARIETY_CORN.equals(mark)) {
htmlStr = InoutBill.IN_CHECK_CORN;
- } else if (data.getFoodVariety() == FoodVariety.FOOD_VARIETY_SOYBEAN) {
+ } else if (FoodVariety.FOOD_VARIETY_SOYBEAN.equals(data.getFoodVariety())) {
htmlStr = InoutBill.IN_CHECK_SOYBEAN;
} else {
return "妯℃澘鏆傛湭纭畾锛侊紒";
@@ -365,23 +366,35 @@
// 鏇挎崲鍩虹鏁版嵁
String time = DateFormatUtils.format(data.getRegisterTime(),
"yyyy-MM-dd");
+ String checkTime = data.getCheckTime() == null ? "-" : DateFormatUtils.format(data.getCheckTime(), "yyyy-MM-dd HH:mm:ss");
+ String sampleTime = data.getSampleTime() == null ? "-" : DateFormatUtils.format(data.getSampleTime(), "yyyy-MM-dd HH:mm:ss");
+ String reportTime = DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss");
// htmlStr = htmlStr.replace("time", time);
htmlStr = htmlStr.replace("customerName", data.getCustomerName());
- htmlStr = htmlStr.replace("serId", data.getId());
+ htmlStr = htmlStr.replace("serId", data.getId().substring(2));
htmlStr = htmlStr.replace("deptName", dept.getName());
htmlStr = htmlStr.replace("foodVariety", FoodVariety.getMsg(data.getFoodVariety()));
htmlStr = htmlStr.replace("plateNum", data.getPlateNum());
htmlStr = htmlStr.replace("userName", data.getUserName());
- htmlStr = htmlStr.replace("foodYear", data.getFoodYear() == null ? "/" : data.getFoodYear());
+ htmlStr = htmlStr.replace("foodYear", data.getFoodYear() == null ? "-" : data.getFoodYear());
Depot depot = commonService.getCacheDepot(data.getCompanyId(), data.getDepotId());
htmlStr = htmlStr.replace("storeKeeperName", depot == null ? "" : (depot.getStoreKeeperName() == null ? "" : depot.getStoreKeeperName()));
- htmlStr = htmlStr.replace("depotName", depot == null ? "/" : depot.getName());
- htmlStr = htmlStr.replace("checkUser", data.getCheckUser() == null ? "/" : data.getCheckUser());
- htmlStr = htmlStr.replace("foodType", data.getFoodType() == null ? "/" : data.getFoodType());
+ htmlStr = htmlStr.replace("depotName", depot == null ? "-" : depot.getName());
+ htmlStr = htmlStr.replace("checkUser", data.getCheckUser() == null ? "-" : data.getCheckUser());
+ htmlStr = htmlStr.replace("foodType", data.getFoodType() == null ? "-" : data.getFoodType());
htmlStr = htmlStr.replace("foodNumber", data.getSettleWeight() + "");
htmlStr = htmlStr.replace("checkNum", data.getDeCheck() + "");
- htmlStr = htmlStr.replace("foodLocation", data.getFoodLocation() == null ? "/" : data.getFoodLocation());
- htmlStr = htmlStr.replace("foodLevel", data.getFoodLevel() == null ? "/" : data.getFoodLevel());
+ htmlStr = htmlStr.replace("foodLocation", data.getFoodLocation() == null ? "-" : data.getFoodLocation());
+ htmlStr = htmlStr.replace("foodLevel", data.getFoodLevel() == null ? "-" : FoodLevel.getMsg(data.getFoodLevel()));
+ htmlStr = htmlStr.replace("hwmc", "");
+
+ htmlStr = htmlStr.replace("unit", "");
+ htmlStr = htmlStr.replace("sampleUser", data.getSampleUser() == null ? "-" : data.getSampleUser());
+ htmlStr = htmlStr.replace("checkTime", checkTime);
+ htmlStr = htmlStr.replace("sampleTime", sampleTime);
+ htmlStr = htmlStr.replace("bgcjsj", reportTime);
+ htmlStr = htmlStr.replace("remark", data.getRemarks() == null ? "鏃�" : data.getRemarks());
+
Map<String, String> checkBillItems = getCheckBillItems();
// 閬嶅巻鍖栭獙缁撴灉锛屽瓨鍏ap闆嗗悎涓�
String key;
@@ -413,44 +426,76 @@
*/
private Map<String, String> getCheckBillItems() {
Map<String, String> map = new HashMap<>();
- map.put("C03_ST", "");
- map.put("C03_VAL", "");
map.put("C01_ST", "");
map.put("C01_VAL", "");
map.put("C02_ST", "");
map.put("C02_VAL", "");
+ map.put("C03_ST", "");
+ map.put("C03_VAL", "");
+ map.put("C04_ST", "");
+ map.put("C04_VAL", "");
+ map.put("C05_ST", "");
+ map.put("C05_VAL", "");
+ map.put("C06_ST", "");
+ map.put("C06_VAL", "");
+ map.put("C07_ST", "");
+ map.put("C07_VAL", "");
+ map.put("C08_ST", "");
+ map.put("C08_VAL", "");
map.put("C09_ST", "");
map.put("C09_VAL", "");
+ map.put("C10_ST", "");
+ map.put("C10_VAL", "");
+ map.put("C11_ST", "");
+ map.put("C11_VAL", "");
+ map.put("C12_ST", "");
+ map.put("C12_VAL", "");
+ map.put("C13_ST", "");
+ map.put("C13_VAL", "");
+ map.put("C14_ST", "");
+ map.put("C14_VAL", "");
+ map.put("C15_ST", "");
+ map.put("C15_VAL", "");
+ map.put("C16_ST", "");
+ map.put("C16_VAL", "");
+ map.put("C17_ST", "");
+ map.put("C17_VAL", "");
+ map.put("C18_ST", "");
+ map.put("C18_VAL", "");
+ map.put("C19_ST", "");
+ map.put("C19_VAL", "");
+ map.put("C20_ST", "");
+ map.put("C20_VAL", "");
+ map.put("C21_ST", "");
+ map.put("C21_VAL", "");
map.put("C22_ST", "");
map.put("C22_VAL", "");
map.put("C23_ST", "");
map.put("C23_VAL", "");
- map.put("C10_ST", "");
- map.put("C10_VAL", "");
- map.put("C04_ST", "");
- map.put("C04_VAL", "");
map.put("C24_ST", "");
map.put("C24_VAL", "");
- map.put("C08_ST", "");
- map.put("C08_VAL", "");
- map.put("C12_ST", "");
- map.put("C12_VAL", "");
map.put("C25_ST", "");
map.put("C25_VAL", "");
- map.put("C14_ST", "");
- map.put("C14_VAL", "");
- map.put("C29_ST", "");
- map.put("C29_VAL", "");
- map.put("C11_ST", "");
- map.put("C11_VAL", "");
+ map.put("C26_ST", "");
+ map.put("C26_VAL", "");
map.put("C27_ST", "");
map.put("C27_VAL", "");
map.put("C28_ST", "");
map.put("C28_VAL", "");
+ map.put("C29_ST", "");
+ map.put("C29_VAL", "");
map.put("C30_ST", "");
map.put("C30_VAL", "");
map.put("C31_ST", "");
map.put("C31_VAL", "");
+ map.put("C32_ST", "");
+ map.put("C32_VAL", "");
+ map.put("C33_ST", "");
+ map.put("C33_VAL", "");
+ map.put("C34_ST", "");
+ map.put("C34_VAL", "");
+ map.put("C35_ST", "");
+ map.put("C35_VAL", "");
return map;
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
index 02c20df..fba9706 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
@@ -1,82 +1,81 @@
-
/**
* 鎵撳嵃鍑哄簱杩囩鍗�
*/
-printBill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- LODOP.SET_PRINT_PAGESIZE(1,2100,1400, "A4");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
+printBill = function (htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("绉伴噸鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 2100, 1400, "A4");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
};
-print5016Bill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
+print5016Bill = function (htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("绉伴噸鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
};
/**
* 鎵撳嵃璐ㄦ鍗�
*/
-printCheckBill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("璐ㄦ鍗�");
- LODOP.SET_PRINT_PAGESIZE(1,2100,2970, "A4");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
+printCheckBill = function (htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("璐ㄦ鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "A4");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
};
-print5016CheckBill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("璐ㄦ鍗�");
- LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
+print5016CheckBill = function (htmlStr) {
+ var LODOP = CLODOP;
+ LODOP.PRINT_INIT("璐ㄦ鍗�");
+ LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "A4");
+ LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
+ LODOP.PREVIEW();
};
//鎵撳嵃鎵︽牱鍗�
-printCheck = function(){
- var data = view.get("#dsMain.data");
- if(!data) return;
- var companyId = data.get("companyId");
- console.log(companyId);
- view.get("#ajaxPrintCheckBill").set("parameter",data).execute(function(result){
- if(companyId && companyId == "5016"){
- print5016ShipBill(result);
- }else {
- printCheckBill(result);
- }
- });
+printCheck = function () {
+ var data = view.get("#dsMain.data");
+ if (!data) return;
+ var companyId = data.get("companyId");
+ console.log(companyId);
+ view.get("#ajaxPrintCheckBill").set("parameter", data).execute(function (result) {
+ if (companyId && companyId == "5016") {
+ print5016ShipBill(result);
+ } else {
+ printCheckBill(result);
+ }
+ });
};
//鎵撳嵃绉伴噸鍗�
-printWeight = function(){
- var data = view.get("#dsMain.data");
- if(!data) return;
- var companyId = data.get("companyId");
- console.log(companyId);
- view.get("#ajaxPrint").set("parameter",data).execute(function(result){
- if(companyId && companyId == "5016"){
- print5016Bill(result);
- }else {
- printBill(result);
- }
- });
+printWeight = function () {
+ var data = view.get("#dsMain.data");
+ if (!data) return;
+ var companyId = data.get("companyId");
+ console.log(companyId);
+ view.get("#ajaxPrint").set("parameter", data).execute(function (result) {
+ if (companyId && companyId == "5016") {
+ print5016Bill(result);
+ } else {
+ printBill(result);
+ }
+ });
};
//@Bind #tabControlMain.onTabChange
-!function(self,arg){
- var tab = arg.newTab;
- var data = view.get("#dsMain.data");
- if(tab.get("name") == 'tabCheck' && data.get('type') == 'OUT' ){
- view.get("#tabCheck").set("disabled",true);
- $notify("鍑哄簱琛ュ崟锛屼笉鎻愪氦璐ㄦ淇℃伅");
- }else{
- view.get("#tabCheck").set("disabled",false);
- }
+!function (self, arg) {
+ var tab = arg.newTab;
+ var data = view.get("#dsMain.data");
+ if (tab.get("name") == 'tabCheck' && data.get('type') == 'OUT') {
+ view.get("#tabCheck").set("disabled", true);
+ $notify("鍑哄簱琛ュ崟锛屼笉鎻愪氦璐ㄦ淇℃伅");
+ } else {
+ view.get("#tabCheck").set("disabled", false);
+ }
};
@@ -84,38 +83,39 @@
* 鑷姩璁＄畻
* @param name
*/
-deAutoByWeight = function(name){
-
- if(null == name) name = "1";
-
- var curData = view.get("#dsMain.data:#");
- var fullWeight = curData.get("fullWeight");
- var emptyWeight = curData.get("emptyWeight");
-
- if(fullWeight == 0 || emptyWeight == 0){
- return;
- }
- // 鍑�閲�
- var netWeight = Number(fullWeight) - Number(emptyWeight);
-
- if (netWeight <= 0){
- $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
- return;
- }
-
- //鎵ｉ噸淇℃伅
- var deHandle = curData.get("deHandle"), deCheck = curData.get("deCheck"), dePackage = curData.get("dePackage"), addCheck = curData.get("addCheck");
-
- var deSum = Number(deHandle) + Number(deCheck) + Number(dePackage);
-
-
+deAutoByWeight = function (name) {
+
+ if (null == name) name = "1";
+
+ var curData = view.get("#dsMain.data:#");
+ var fullWeight = curData.get("fullWeight");
+ var emptyWeight = curData.get("emptyWeight");
+
+ if (fullWeight == 0 || emptyWeight == 0) {
+ return;
+ }
+ // 鍑�閲�
+ var netWeight = Number(fullWeight) - Number(emptyWeight);
+
+ if (netWeight <= 0) {
+ $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+ return;
+ }
+
+ //鎵ｉ噸淇℃伅
+ var deHandle = curData.get("deHandle"), deCheck = curData.get("deCheck"), dePackage = curData.get("dePackage"),
+ addCheck = curData.get("addCheck");
+
+ var deSum = Number(deHandle) + Number(deCheck) + Number(dePackage);
+
+
/** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
recordWeight = Number(netWeight) - Number(deSum);
-
+
/** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
settleWeight = Number(netWeight) - Number(deSum) + Number(addCheck);
-
- curData.set("netWeight",netWeight);
- curData.set("settleWeight",settleWeight);
- curData.set("recordWeight",recordWeight);
+
+ curData.set("netWeight", netWeight);
+ curData.set("settleWeight", settleWeight);
+ curData.set("recordWeight", recordWeight);
};
\ No newline at end of file
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 bb82dda..65e756f 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
@@ -491,6 +491,7 @@
<DataColumn name="name">
<Property name="property">name</Property>
<Property name="align">center</Property>
+ <Property name="width">340</Property>
</DataColumn>
<DataColumn name="type">
<Property name="property">type</Property>
@@ -503,6 +504,7 @@
<DataColumn name="customerName">
<Property name="property">customerName</Property>
<Property name="align">center</Property>
+ <Property name="width">300</Property>
</DataColumn>
<DataColumn name="money">
<Property name="property">money</Property>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutCustomer.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutCustomer.view.xml
index 6e4fe15..579145c 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutCustomer.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutCustomer.view.xml
@@ -129,9 +129,10 @@
<DataColumn name="name">
<Property name="property">name</Property>
<Property name="width">300</Property>
+ <Property name="align">center</Property>
</DataColumn>
- <DataColumn name="cardId">
- <Property name="property">cardId</Property>
+ <DataColumn name="khbh">
+ <Property name="property">khbh</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="contactUser">
@@ -199,29 +200,40 @@
<Property name="cols">*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">140</Property>
<AutoFormElement>
<Property name="name">name</Property>
<Property name="property">name</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement id="editId">
- <Property name="name">id</Property>
- <Property name="property">id</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 瑙勫垯锛�5浣嶆暟瀛楋紙涓嶅～鍒欑郴缁熻嚜鍔ㄧ敓鎴愶級 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
+ <AutoFormElement id="editId">
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor>
+ <TextEditor>
+ <Property name="blankText">-- 瑙勫垯锛�5浣嶆暟瀛楋紙涓嶅～鍒欑郴缁熻嚜鍔ㄧ敓鎴愶級 --</Property>
+ </TextEditor>
+ </Editor>
+ </AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">address</Property>
<Property name="property">address</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">cardId</Property>
- <Property name="property">cardId</Property>
+ <Property name="name">khbh</Property>
+ <Property name="property">khbh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label>
+ <Property name="text">璇存槑锛氫紒涓氬鎴峰～鍐欑粺涓�绀句細淇＄敤浠ｇ爜锛屼釜浜哄鎴峰～鍐欒韩浠借瘉鍙�</Property>
+ <Property name="style">
+ <Property name="color">blue</Property>
+ </Property>
+ </Label>
+ <AutoFormElement>
+ <Property name="name">khlx</Property>
+ <Property name="property">khlx</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -240,6 +252,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">foodArea</Property>
<Property name="property">foodArea</Property>
<Editor/>
@@ -249,6 +266,36 @@
<Property name="property">type</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">contactUser</Property>
+ <Property name="property">contactUser</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">cardId</Property>
+ <Property name="property">cardId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fddbr</Property>
+ <Property name="property">fddbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yzbm</Property>
+ <Property name="property">yzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dzyx</Property>
+ <Property name="property">dzyx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
<Tools/>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
index 78bb1ea..ab7e9dc 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -306,11 +306,10 @@
</DataPilot>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:10">
- <Property name="width">60%</Property>
+ <Property name="width">70%</Property>
<Property name="caption">璇︾粏淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
- <Property name="height">80%</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
index c670b3c..da8e0ab 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
@@ -336,7 +336,7 @@
</DataPilot>
</Container>
<Dialog id="dialogMain" layout="padding:5;regionPadding:10">
- <Property name="width">60%</Property>
+ <Property name="width">70%</Property>
<Property name="caption">绮鍝佺鍙樻洿淇℃伅</Property>
<Property name="iconClass">fa fa-flag-o</Property>
<Property name="closeable">false</Property>
diff --git a/igds-inout/src/main/java/models/inout.model.xml b/igds-inout/src/main/java/models/inout.model.xml
index c172533..ff5ada6 100644
--- a/igds-inout/src/main/java/models/inout.model.xml
+++ b/igds-inout/src/main/java/models/inout.model.xml
@@ -9,7 +9,7 @@
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
- <Property name="label">瀹㈡埛绫诲瀷</Property>
+ <Property name="label">涓氬姟鍒嗙被</Property>
<Property name="mapping">
<Property name="mapValues">
<Collection>
@@ -34,12 +34,12 @@
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
- <Property name="label">鍗曚綅鍚嶅悕绉�</Property>
+ <Property name="label">瀹㈡埛鍚嶇О</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cardId">
<Property></Property>
- <Property name="label">韬唤璇佸彿</Property>
+ <Property name="label">鑱旂郴浜鸿韩浠借瘉鍙�</Property>
</PropertyDef>
<PropertyDef name="address">
<Property></Property>
@@ -68,6 +68,40 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="khlx">
+ <Property/>
+ <Property name="label">瀹㈡埛绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("contractManagePR#triggerCustomerType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="khbh">
+ <Property/>
+ <Property name="label">瀹㈡埛缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="fddbr">
+ <Property/>
+ <Property name="label">娉曞畾浠ｈ〃浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="yzbm">
+ <Property/>
+ <Property name="label">閭斂缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="dzyx">
+ <Property/>
+ <Property name="label">鐢靛瓙淇＄</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
<DataType name="dtInoutRecord">
diff --git a/igds-web/src/main/resources/templates/test/qualityReport01.html b/igds-web/src/main/resources/templates/test/qualityReport01.html
index fd793e9..3b0ba86 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport01.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport01.html
@@ -16,7 +16,9 @@
}
.div-tit {
- padding-top: 10px
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
}
table {
@@ -31,17 +33,10 @@
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>
+<body><h1 class='tit'>璐ㄦ鎶ュ憡(foodVariety)</h1>
+<div class='div-tit'>鍗曞彿锛歴erId</div>
<table cellspacing='0' cellpadding='0'>
<tr>
<td colspan='2' rowspan="5" `width`="15%">鏍峰搧淇℃伅</td>
@@ -97,7 +92,7 @@
<td>鎵︽牱鏃堕棿</td>
<td>sampleTime</td>
<td>妫�楠屾椂闂�</td>
- <td>checkTime2</td>
+ <td>checkTime</td>
<td>鎶ュ憡鍑哄叿鏃堕棿</td>
<td>bgcjsj</td>
</tr>
@@ -107,7 +102,7 @@
<td>鍝佺</td>
<td>foodVariety</td>
<td>鍑虹硻鐜囷紙%锛�</td>
- <td>rough</td>
+ <td>C09_ST</td>
<td>绛夌骇</td>
<td>foodLevel</td>
</tr>
@@ -117,7 +112,7 @@
<td>鏉傝川锛�%锛�</td>
<td>C02_ST</td>
<td>姘村垎锛�%锛�</td>
- <td>c_perWet</td>
+ <td>C01_ST</td>
</tr>
<tr>
<td>榛勭矑绫筹紙%锛�</td>
@@ -125,7 +120,7 @@
<td>璋峰绯欑背锛�%锛�</td>
<td>C12_ST</td>
<td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>C21_ST</td>
</tr>
<tr>
<td>浜掓贩鐜囷紙%锛�</td>
@@ -137,24 +132,24 @@
<td>鑴傝偑閰稿�硷紙mgKOH/100g锛�</td>
<td>C14_ST</td>
<td>鍝佸皾鍒嗗��</td>
- <td>C15_ST</td>
+ <td>C07_ST</td>
<td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>C21_ST</td>
</tr>
<tr>
<td rowspan="2">椋熷搧瀹夊叏妫�楠�</td>
<td>榛勬洸闇夋瘨绱� B1锛埼糶/kg锛�</td>
- <td>C17_ST</td>
+ <td>C28_ST</td>
<td>閾咃紙mg/kg锛�</td>
- <td>C18_ST</td>
+ <td>C32_ST</td>
<td>闀夛紙mg/kg锛�</td>
- <td>C19_ST</td>
+ <td>C25_ST</td>
</tr>
<tr>
<td>姹烇紙渭g/kg锛�</td>
- <td>C20_ST</td>
+ <td>C34_ST</td>
<td>鏃犳満鐮凤紙mg/kg锛�</td>
- <td>C21_ST</td>
+ <td>C30_ST</td>
<td colspan="2"></td>
</tr>
<tr>
@@ -162,5 +157,6 @@
<td colspan="6">remark</td>
</tr>
</table>
+<div class='div-tit'></div>
</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
index 96eac79..4298818 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport02.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport02.html
@@ -16,7 +16,9 @@
}
.div-tit {
- padding-top: 10px
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
}
table {
@@ -40,8 +42,7 @@
</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>
+<div class='div-tit'>鍗曞彿锛歴erId</div>
<table cellspacing='0' cellpadding='0'>
<tr>
<td colspan='2' rowspan="5" `width`="15%">鏍峰搧淇℃伅</td>
@@ -97,7 +98,7 @@
<td>鎵︽牱鏃堕棿</td>
<td>sampleTime</td>
<td>妫�楠屾椂闂�</td>
- <td>checkTime2</td>
+ <td>checkTime</td>
<td>鎶ュ憡鍑哄叿鏃堕棿</td>
<td>bgcjsj</td>
</tr>
@@ -107,34 +108,34 @@
<td>鍝佺</td>
<td>foodVariety</td>
<td>瀹归噸锛坓/L锛�</td>
- <td>bulkWeight</td>
+ <td>C03_ST</td>
<td>绛夌骇</td>
<td>foodLevel</td>
</tr>
<tr>
- <td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>鑹叉辰姘斿懗</td>
+ <td>C06_ST</td>
<td>鏉傝川锛�%锛�</td>
<td>C02_ST</td>
<td>姘村垎锛�%锛�</td>
- <td>c_perWet</td>
+ <td>C01_ST</td>
</tr>
<tr>
<td>涓嶅畬鍠勭矑锛�%锛�</td>
<td>C04_ST</td>
<td>鐢熻娊绮掞紙%锛�</td>
- <td>C05_ST</td>
+ <td>C35_ST</td>
<td>鐢熼湁绮掞紙%锛�</td>
- <td>C06_ST</td>
+ <td>C29_ST</td>
</tr>
<tr>
<td>鍌ㄥ瓨鍝佽川妫�楠�</td>
<td>闈㈢瓔鍚告按閲忥紙%锛�</td>
<td>C08_ST</td>
<td>鍝佸皾鍒嗗��</td>
- <td>C15_ST</td>
- <td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>C07_ST</td>
+ <td>鑹叉辰姘斿懗</td>
+ <td>C06_ST</td>
</tr>
<tr>
<td rowspan="2">椋熷搧瀹夊叏妫�楠�</td>
@@ -143,20 +144,21 @@
<td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td>
<td>C31_ST</td>
<td>閾咃紙mg/kg锛�</td>
- <td>C18_ST</td>
+ <td>C32_ST</td>
</tr>
<tr>
<td>闀夛紙mg/kg锛�</td>
- <td>C19_ST</td>
+ <td>C25_ST</td>
<td>姹烇紙渭g/kg锛�</td>
- <td>C20_ST</td>
+ <td>C33_ST</td>
<td>鏃犳満鐮凤紙mg/kg锛�</td>
- <td>C21_ST</td>
+ <td>C30_ST</td>
</tr>
<tr>
<td colspan="2">澶囨敞</td>
<td colspan="6">remark</td>
</tr>
</table>
+<div class='div-tit'></div>
</body>
</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/test/qualityReport03.html b/igds-web/src/main/resources/templates/test/qualityReport03.html
index 0dad000..13328ac 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport03.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport03.html
@@ -16,7 +16,9 @@
}
.div-tit {
- padding-top: 10px
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
}
table {
@@ -31,17 +33,10 @@
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>
+<div class='div-tit'>鍗曞彿锛歴erId</div>
<table cellspacing='0' cellpadding='0'>
<tr>
<td colspan='2' rowspan="5" `width`="15%">鏍峰搧淇℃伅</td>
@@ -97,7 +92,7 @@
<td>鎵︽牱鏃堕棿</td>
<td>sampleTime</td>
<td>妫�楠屾椂闂�</td>
- <td>checkTime2</td>
+ <td>checkTime</td>
<td>鎶ュ憡鍑哄叿鏃堕棿</td>
<td>bgcjsj</td>
</tr>
@@ -107,25 +102,25 @@
<td>鍝佺</td>
<td>foodVariety</td>
<td>瀹归噸锛坓/L锛�</td>
- <td>bulkWeight</td>
+ <td>C03_ST</td>
<td>绛夌骇</td>
<td>foodLevel</td>
</tr>
<tr>
- <td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>鑹叉辰姘斿懗</td>
+ <td>C06_ST</td>
<td>鏉傝川锛�%锛�</td>
<td>C02_ST</td>
<td>姘村垎锛�%锛�</td>
- <td>c_perWet</td>
+ <td>C01_ST</td>
</tr>
<tr>
<td>涓嶅畬鍠勭矑锛�%锛�</td>
<td>C04_ST</td>
<td>鐢熼湁绮掞紙%锛�</td>
- <td>C06_ST</td>
+ <td>C29_ST</td>
<td>闇夊彉绮掞紙%锛�</td>
- <td>C07_ST</td>
+ <td>C15_ST</td>
</tr>
<tr>
<td>鍌ㄥ瓨鍝佽川妫�楠�</td>
@@ -133,8 +128,8 @@
<td>C14_ST</td>
<td>鍝佸皾鍒嗗��</td>
<td>C15_ST</td>
- <td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>鑹叉辰姘斿懗</td>
+ <td>C06_ST</td>
</tr>
<tr>
<td rowspan="2">椋熷搧瀹夊叏妫�楠�</td>
@@ -143,20 +138,21 @@
<td>鐜夌背璧ら湁鐑叜锛埼糶/kg锛�</td>
<td>C31_ST</td>
<td>閾咃紙mg/kg锛�</td>
- <td>C18_ST</td>
+ <td>C32_ST</td>
</tr>
<tr>
<td>闀夛紙mg/kg锛�</td>
- <td>C19_ST</td>
+ <td>C25_ST</td>
<td>姹烇紙渭g/kg锛�</td>
- <td>C20_ST</td>
+ <td>C33_ST</td>
<td>鏃犳満鐮凤紙mg/kg锛�</td>
- <td>C21_ST</td>
+ <td>C30_ST</td>
</tr>
<tr>
<td colspan="2">澶囨敞</td>
<td colspan="6">remark</td>
</tr>
</table>
+<div class='div-tit'></div>
</body>
</html>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/templates/test/qualityReport04.html b/igds-web/src/main/resources/templates/test/qualityReport04.html
index bac77a2..6237e4c 100644
--- a/igds-web/src/main/resources/templates/test/qualityReport04.html
+++ b/igds-web/src/main/resources/templates/test/qualityReport04.html
@@ -16,7 +16,9 @@
}
.div-tit {
- padding-top: 10px
+ text-align: right;
+ padding-top: 10px;
+ padding-right: 20px;
}
table {
@@ -31,17 +33,10 @@
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>
+<div class='div-tit'>鍗曞彿锛歴erId</div>
<table cellspacing='0' cellpadding='0'>
<tr>
<td colspan='2' rowspan="5" `width`="15%">鏍峰搧淇℃伅</td>
@@ -97,7 +92,7 @@
<td>鎵︽牱鏃堕棿</td>
<td>sampleTime</td>
<td>妫�楠屾椂闂�</td>
- <td>checkTime2</td>
+ <td>checkTime</td>
<td>鎶ュ憡鍑哄叿鏃堕棿</td>
<td>bgcjsj</td>
</tr>
@@ -107,7 +102,7 @@
<td>鍝佺</td>
<td>foodVariety</td>
<td>瀹屾暣绮掔巼锛�%锛�</td>
- <td>C22_ST</td>
+ <td>C16_ST</td>
<td>绛夌骇</td>
<td>foodLevel</td>
</tr>
@@ -115,32 +110,32 @@
<td>鏉傝川锛�%锛�</td>
<td>C02_ST</td>
<td>姘村垎锛�%锛�</td>
- <td>c_perWet</td>
- <td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>C01_ST</td>
+ <td>鑹叉辰姘斿懗</td>
+ <td>C06_ST</td>
</tr>
<tr>
<td>鎹熶激绮掔巼锛�%锛�</td>
- <td>C23_ST</td>
+ <td>C17_ST</td>
<td>鐑崯浼ょ矑锛�%锛�</td>
- <td>C24_ST</td>
+ <td>C34_ST</td>
<td colspan="2"></td>
</tr>
<tr>
<td>鍌ㄥ瓨鍝佽川妫�楠�</td>
<td>绮楄剛鑲吀鍊硷紙mgKOH/100g锛�</td>
- <td>C25_ST</td>
+ <td>C18_ST</td>
<td>鍝佸皾鍒嗗��</td>
- <td>C15_ST</td>
- <td>鑹叉辰銆佹皵鍛�</td>
- <td>C16_ST</td>
+ <td>C07_ST</td>
+ <td>鑹叉辰姘斿懗</td>
+ <td>C06_ST</td>
</tr>
<tr>
<td>椋熷搧瀹夊叏妫�楠�</td>
<td>閾咃紙mg/kg锛�</td>
- <td>C18_ST</td>
+ <td>C32_ST</td>
<td>闀夛紙mg/kg锛�</td>
- <td>C19_ST</td>
+ <td>C25_ST</td>
<td colspan="2"></td>
</tr>
<tr>
@@ -148,5 +143,6 @@
<td colspan="6">remark</td>
</tr>
</table>
+<div class='div-tit'></div>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.3