igds-core/src/main/java/com/ld/igds/constant/FoodVariety.java
@@ -11,6 +11,22 @@ * åèï¼LST1703-2017 æ åéæ°å®ä¹ */ public class FoodVariety { /** * å°éº¦ */ public static final String FOOD_VARIETY_WHEAT = "111"; /** * 稻谷 */ public static final String FOOD_VARIETY_PADDY = "112"; /** * çç±³ */ public static final String FOOD_VARIETY_CORN = "113"; /** * å¤§è± */ public static final String FOOD_VARIETY_SOYBEAN = "1411001"; /** * æ ¹æ®åç§°æ¾ç¼ç igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -22,20 +22,17 @@ <Property name="label">åºåºç¼ç </Property> </PropertyDef> <PropertyDef name="depotId"> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()} </Property> <Property name="keyProperty">id</Property> <Property name="valueProperty">name</Property> </Property> <Property name="label">æ£æµä»åº</Property> <Property name="required">true</Property> <Property name="mapping"> <Property name="keyProperty">id</Property> <Property name="valueProperty">name</Property> <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property> </Property> </PropertyDef> <PropertyDef name="foodVariety"> <Property name="mapping"> <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")} </Property> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> @@ -44,8 +41,8 @@ </PropertyDef> <PropertyDef name="foodLevel"> <Property name="mapping"> <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")} <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}
 ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}
 </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> @@ -55,8 +52,7 @@ <PropertyDef name="foodType"> <Property name="label">ç²®é£æ§è´¨</Property> <Property name="mapping"> <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")} <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}
 </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> @@ -68,8 +64,7 @@ <PropertyDef name="type"> <Property name="label">æ£éªç±»å«</Property> <Property name="mapping"> <Property name="mapValues"> ${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()} <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
 </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> @@ -157,8 +152,7 @@ <Property></Property> <Property name="label">ä»åº</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()} </Property> <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property> <Property name="keyProperty">id</Property> <Property name="valueProperty">name</Property> </Property> @@ -600,6 +594,7 @@ <AutoFormElement> <Property name="name">depotId</Property> <Property name="property">depotId</Property> <Property name="trigger">autoMappingDropDown2</Property> <Editor/> </AutoFormElement> <AutoFormElement> @@ -779,7 +774,7 @@ <Property name="service">depotPR#getDepot</Property> </AjaxAction> <AjaxAction id="ajaxGetCheck"> <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property> <Property name="service">checkStandardPR#listCheckItemsByParam</Property> </AjaxAction> <CustomDropDown id="ddFoodOrigin"> <Property name="minHeight">480</Property> igds-core/src/main/java/com/ld/igds/models/MQuality.java
@@ -91,7 +91,7 @@ private Date bgcjsj; @PropertyDef(label = "å®¡æ ¸äººå§å") @Column(name = "shrxm", length = 64, nullable = false) @Column(name = "shrxm", length = 64) private String shrxm; @PropertyDef(label = "æ¦æ ·åç¼å·") igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java
@@ -19,8 +19,22 @@ * é»è®¤éªæ£å */ public static String IN_CHECK_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}h1{font-weight:400;font-size:24px;margin:5px}span{padding-bottom:10px}.div-tit{padding-top:10px}.div-tit2{padding-top:30px}.fl{float:left}.fr{float:right}.fp{margin-left:145px}.f2{float:left}table{width:100%;border-right:1px solid;border-bottom:1px solid}table td{border-left:1px solid;border-top:1px solid;height:30px;font-size:14px}</style></head><body><h1>billTitle</h1><div class='div-tit'><span class='fl'>åè´§åä½ï¼customerName</span><span>æ¶é´ï¼time</span><span class='fr'>å ¥åºåå·ï¼serId</span></div><table cellspacing='0'cellpadding='0'><tr><td>åç§</td><td>foodVariety</td><td>æ ·åæ¥æº</td><td>ç°åºæ¦æ ·</td><td>车çå·</td><td>plateNum</td><td>æ¿è¿äºº</td><td>userName</td><td></td></tr><tr><td>æ¶è´§å¹´ä»½</td><td>foodYear</td><td>è²æ³½æ°å³</td><td>æ£å¸¸</td><td>å ¥åºä»å·</td><td>depotName</td><td>ç²®é£æ§è´¨</td><td>ååç²®</td><td></td></tr><tr><td>æ£éªé¡¹ç®</td><td>æ åå¼</td><td>æ£éªå¼</td><td>æ£éªé¡¹ç®</td><td>æ åå¼</td><td>æ£éªå¼</td><td>æ£éªé¡¹ç®</td><td>æ åå¼</td><td>æ£éªå¼</td></tr><tr><td>容ég/l</td><td>C03_ST</td><td>C03_VAL</td><td>æ°´å</td><td>C01_ST</td><td>C01_VAL</td><td>æè´¨</td><td>C02_ST</td><td>C02_VAL</td></tr><tr><td>åºç³ç%</td><td>C09_ST</td><td>C09_VAL</td><td>é ¸å¼</td><td>C22_ST</td><td>C22_VAL</td><td>è¿æ°§åå¼</td><td>C23_ST</td><td>C23_VAL</td></tr><tr><td>æ´ç²¾ç±³ç%</td><td>C10_ST</td><td>C10_VAL</td><td>ä¸å®åç²%</td><td>C04_ST</td><td>C04_VAL</td><td>æº¶åæ®çé</td><td>C24_ST</td><td>C24_VAL</td></tr><tr><td>é¢ç叿°´é</td><td>C08_ST</td><td>C08_VAL</td><td>è°·å¤ç³ç±³%</td><td>C12_ST</td><td>C12_VAL</td><td>ééå±(é)</td><td>C25_ST</td><td>C25_VAL</td></tr><tr><td>èèªé ¸å¼</td><td>C14_ST</td><td>C14_VAL</td><td>çéç%</td><td>C29_ST</td><td>C29_VAL</td><td>é»ç²ç±³%</td><td>C11_ST</td><td>C11_VAL</td></tr><tr><td>ååæ¯ç´ </td><td>C27_ST</td><td>C27_VAL</td><td>黿²éæ¯ç´ B1</td><td>C28_ST</td><td>C28_VAL</td><td>ééå±(ç ·)</td><td>C30_ST</td><td>C30_VAL</td></tr><tr><td>ç米赤éç¯é ®</td><td>C31_ST</td><td>C31_VAL</td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td colspan=â2â>æ£éªç»è®ºå建议</td><td rowspan='8'colspan='8'></td></tr></table><div class='div-tit'><span class='fl'>æ£éªåï¼checkUser</span><span class='fr'>æ¿è¿äººç¾åï¼ </span></div></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 {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'>åå·ï¼serId</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>容éï¼g/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>ç米赤éç¯é ®ï¼Î¼g/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_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'>åå·ï¼serId</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ï¼Î¼g/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_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'>åå·ï¼serId</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>容éï¼g/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>ç米赤éç¯é ®ï¼Î¼g/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_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'>åå·ï¼serId</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>"; /** * é»è®¤ç»ç®å */ igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -335,15 +335,26 @@ // è·ååéªæ°æ® List<CheckItemData> checkLst = data.getCheckItems(); if (null == checkLst) checkStandardService.getCheckItemById(data.getCheckId(), data.getCompanyId()); checkStandardService.getCheckItemById(data.getCheckId(), data.getCompanyId()); if (checkLst == null || checkLst.size() < 1) { return "æ åéªæ°æ®ï¼ä¸æå°ï¼"; } String mark = data.getFoodVariety().substring(0, 3); // è°æ´æ¨¡çæ°æ®å¹¶è¿å String htmlStr = InoutBill.IN_CHECK_DEFAULT; String htmlStr = ""; if (mark == FoodVariety.FOOD_VARIETY_WHEAT) { htmlStr = InoutBill.IN_CHECK_WHEAT; } else if (mark == FoodVariety.FOOD_VARIETY_PADDY) { htmlStr = InoutBill.IN_CHECK_PADDY; } else if (mark == FoodVariety.FOOD_VARIETY_CORN) { htmlStr = InoutBill.IN_CHECK_CORN; } else if (data.getFoodVariety() == FoodVariety.FOOD_VARIETY_SOYBEAN) { htmlStr = InoutBill.IN_CHECK_SOYBEAN; } else { return "æ¨¡æ¿ææªç¡®å®ï¼ï¼"; } DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getDeptId()); @@ -354,24 +365,30 @@ // æ¿æ¢åºç¡æ°æ® String time = DateFormatUtils.format(data.getRegisterTime(), "yyyy-MM-dd"); htmlStr = htmlStr.replace("time", time); // htmlStr = htmlStr.replace("time", time); htmlStr = htmlStr.replace("customerName", data.getCustomerName()); htmlStr = htmlStr.replace("serId", data.getId()); 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()); 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("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()); Map<String, String> checkBillItems = getCheckBillItems(); // éååéªç»æï¼åå ¥mapéåä¸ String key; for (CheckItemData item : checkLst) { key = item.getStandardId() + "_ST"; // checkBillItems.put(key, item.getStandardValue()); key = item.getStandardId() + "_VAL"; // key = item.getStandardId() + "_VAL"; checkBillItems.put(key, item.getValue()); } igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js
@@ -18,9 +18,37 @@ 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(); }; 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(); }; //æå°æ¦æ ·å printCheck = function(){ $alert("æå°æ¨¡çæªå®ä¹â¦â¦"); 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); } }); }; //æå°ç§°éå igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -607,6 +607,11 @@ <Property name="executingMessage">æ£å¨æ§è¡æå°â¦â¦</Property> <Property name="async">false</Property> </AjaxAction> <AjaxAction id="ajaxPrintCheckBill"> <Property name="async">false</Property> <Property name="executingMessage">æ£å¨æ§è¡æå°â¦â¦</Property> <Property name="service">inoutDataPR#printShipBill</Property> </AjaxAction> <CustomDropDown id="ddDicArea"> <Property name="minHeight">500</Property> <Property name="minWidth">500</Property> igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml
@@ -9,7 +9,8 @@ }
 if(arg.property =="foodVariety"){
 checkByFood(arg.newValue);
 }</ClientEvent> } </ClientEvent> <PropertyDef name="price"> <Property name="dataType">Double</Property> <Property name="label">ç²®é£å®ä»·</Property> @@ -23,7 +24,7 @@ <Property name="deptId">$${this.deptId}</Property> </Entity> </Property> <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property> <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property> <Property name="dataType">[dtCheckItems]</Property> </Reference> </DataType> @@ -40,7 +41,8 @@ <Property></Property> <Property name="label">è£ å¸ä»åº</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property> <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()} </Property> <Property name="keyProperty">id</Property> <Property name="valueProperty">name</Property> </Property> @@ -52,7 +54,9 @@ <Property></Property> <Property name="label">ç²®é£åç§</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property> <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")} </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> @@ -61,7 +65,9 @@ <Property></Property> <Property name="label">æµç¨è¿åº¦</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("PROCESS_STATUS_")}</Property> <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("PROCESS_STATUS_")} </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> @@ -70,7 +76,9 @@ <Property></Property> <Property name="label">æ°æ®ç¶æ</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}</Property> <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")} </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> @@ -79,7 +87,9 @@ <Property></Property> <Property name="label">æ¯å¦åæ ¼</Property> <Property name="mapping"> <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CHECK_STATUS")}</Property> <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CHECK_STATUS")} </Property> <Property name="keyProperty">code</Property> <Property name="valueProperty">name</Property> </Property> @@ -501,7 +511,8 @@ }
 });
 return null;
 }</ClientEvent> } </ClientEvent> <Property name="packages">font-awesome,css-common</Property> <Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property> <DataSet id="dsMain"> @@ -624,7 +635,8 @@ <Button> <ClientEvent name="onClick">var type ="${request.getParameter('type')}";
 var deptId = window.parent.DEPT_ID;//ç¶é¡µé¢ä¸çååºç¼ç 
 view.get("#dsQuery").setData({type:type,deptId:deptId});</ClientEvent> view.get("#dsQuery").setData({type:type,deptId:deptId}); </ClientEvent> <Property name="exClassName">btn-warn</Property> <Property name="iconClass">fa fa-refresh</Property> <Property name="caption">éç½®</Property> @@ -646,14 +658,16 @@ <DataColumn name="id"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.dom.style.color = "#f67d06";
 arg.processDefault = true;</ClientEvent> arg.processDefault = true; </ClientEvent> <Property name="property">id</Property> <Property name="align">center</Property> <Property name="width">150</Property> </DataColumn> <DataColumn name="plateNum"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> arg.processDefault = true; </ClientEvent> <Property name="property">plateNum</Property> <Property name="align">center</Property> <Property name="width">150</Property> @@ -678,7 +692,8 @@ </DataColumn> <DataColumn name="depotId"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> arg.processDefault = true; </ClientEvent> <Property name="property">depotId</Property> <Property name="align">center</Property> <Property name="width">120</Property> @@ -710,14 +725,16 @@ </DataColumn> <DataColumn name="settleWeight"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> arg.processDefault = true; </ClientEvent> <Property name="property">settleWeight</Property> <Property name="align">center</Property> <Property name="width">100</Property> </DataColumn> <DataColumn> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> arg.processDefault = true; </ClientEvent> <Property name="property">recordWeight</Property> <Property name="align">center</Property> <Property name="width">100</Property> @@ -726,7 +743,8 @@ </DataColumn> <DataColumn name="progress"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> arg.processDefault = true; </ClientEvent> <Property name="property">progress</Property> <Property name="align">center</Property> <Property name="width">100</Property> @@ -771,7 +789,8 @@ }
 $notify("æ°æ®æ§è¡å®æï¼ï¼");
 self.get("parent").hide();
 });</ClientEvent> }); </ClientEvent> <Property name="caption">ç¡®å®ä¿å</Property> <Property name="iconClass">fa fa-check</Property> <Property name="exClassName">btn-normal</Property> @@ -808,7 +827,8 @@ view.get("#btnAddCheck").set("visible",true);
 }else{
 view.get("#btnAddCheck").set("visible",false);
 }</ClientEvent> } </ClientEvent> <ControlTab> <Property name="caption">åºç¡ä¿¡æ¯</Property> <Property name="iconClass">fa fa-download</Property> @@ -947,7 +967,8 @@ <ClientEvent name="onBlur">//id è§å d_prop
 var id = self.getDom().id;
 var prop = id.substring(2,id.length);
 deAutoByWeight(prop);</ClientEvent> deAutoByWeight(prop); </ClientEvent> <Property name="name">emptyWeight</Property> <Property name="property">emptyWeight</Property> <Editor/> @@ -972,7 +993,8 @@ <ClientEvent name="onBlur">//id è§å d_prop
 var id = self.getDom().id;
 var prop = id.substring(2,id.length);
 deAutoByWeight(prop);</ClientEvent> deAutoByWeight(prop); </ClientEvent> <Property name="name">deImpurity</Property> <Property name="property">deImpurity</Property> <Property name="showHint">false</Property> @@ -992,7 +1014,8 @@ <ClientEvent name="onBlur">//id è§å d_prop
 var id = self.getDom().id;
 var prop = id.substring(2,id.length);
 deAutoByWeight(prop);</ClientEvent> deAutoByWeight(prop); </ClientEvent> <Property name="name">deWet</Property> <Property name="property">deWet</Property> <Property name="showHint">false</Property> @@ -1012,7 +1035,8 @@ <ClientEvent name="onBlur">//id è§å d_prop
 var id = self.getDom().id;
 var prop = id.substring(2,id.length);
 deAutoByWeight(prop);</ClientEvent> deAutoByWeight(prop); </ClientEvent> <Property name="name">deHandle</Property> <Property name="property">deHandle</Property> <Editor/> @@ -1021,7 +1045,8 @@ <ClientEvent name="onBlur">//id è§å d_prop
 var id = self.getDom().id;
 var prop = id.substring(2,id.length);
 deAutoByWeight(prop);</ClientEvent> deAutoByWeight(prop); </ClientEvent> <Property name="name">deOther</Property> <Property name="property">deOther</Property> <Editor/> @@ -1152,7 +1177,8 @@ 
 if(entity.get("standardId") =="C02"){//éå¿
 inoutData.set("impurity",entity.get("value"));
 }</ClientEvent> } </ClientEvent> <Property name="dataSet">dsMain</Property> <Property name="dataPath">#.checkItems</Property> <Property name="highlightCurrentRow">false</Property> @@ -1334,7 +1360,8 @@ </TextEditor> <Button> <ClientEvent name="onClick">var key = view.get("#key2.value");
 view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent> view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync(); </ClientEvent> <Property name="caption">æ¥è¯¢</Property> <Property name="iconClass">fa fa-search</Property> </Button> @@ -1342,7 +1369,8 @@ <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
 if(data){
 view.get("#ddFoodOrigin").close(data.toJSON());
 }</ClientEvent> } </ClientEvent> <Property name="iconClass">fa fa-check</Property> <Property name="caption">ç¡®å®</Property> </Button> @@ -1351,7 +1379,8 @@ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
 if(data){
 view.get("#ddFoodOrigin").close(data.toJSON());
 }</ClientEvent> } </ClientEvent> <Property name="dataSet">dsFoodOrigin</Property> <Property name="readOnly">true</Property> <DataColumn name="code"> @@ -1361,7 +1390,8 @@ </DataColumn> <DataColumn name="name"> <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
 arg.processDefault = true;</ClientEvent> arg.processDefault = true; </ClientEvent> <Property name="property">name</Property> <Property name="readOnly">true</Property> <Property name="align">center</Property> @@ -1400,7 +1430,9 @@ <Button> <ClientEvent name="onClick">var key = view.get("#key3.value");
 var type = "${request.getParameter('type')}";
 view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent> view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync(); </ClientEvent> <Property name="caption">æ¥è¯¢</Property> <Property name="iconClass">fa fa-search</Property> </Button> @@ -1408,7 +1440,8 @@ <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
 if(data){
 view.get("#ddNotice").close(data.toJSON());
 }</ClientEvent> } </ClientEvent> <Property name="iconClass">fa fa-check</Property> <Property name="caption">ç¡®å®</Property> </Button> @@ -1417,7 +1450,8 @@ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
 if(data){
 view.get("#ddNotice").close(data.toJSON());
 }</ClientEvent> } </ClientEvent> <Property name="dataSet">dsNotice</Property> <Property name="readOnly">true</Property> <DataColumn> @@ -1441,7 +1475,8 @@ <ClientEvent name="onClick">var html = view.get("#textAreaPrint.text");
 
 self.get("parent").hide();
 printBill(html);</ClientEvent> printBill(html); </ClientEvent> <Property name="caption">ç¡®å®</Property> </Button> <Button> @@ -1468,7 +1503,8 @@ printShipWeight();
 }else{
 printWeight();
 }</ClientEvent> } </ClientEvent> <Property name="caption">æå°è¿ç£ å</Property> <Property name="iconClass">fa fa-print</Property> </MenuItem> igds-web/src/main/resources/templates/test/inWeightDefault.html
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,109 @@ <!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'>åå·ï¼serId</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> igds-web/src/main/resources/templates/test/qualityReport01.html
@@ -72,7 +72,7 @@ <td>ç级</td> <td>foodLevel</td> <td>ç产年é</td> <td>scnx</td> <td>foodYear</td> </tr> <tr> <td>æ ·åæ°é</td> igds-web/src/main/resources/templates/test/qualityReport02.html
@@ -2,7 +2,7 @@ <html lang='zh-cn'> <head> <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'> <title>è´¨æ£æ¥å(foodVariety)</title> <title>è´¨æ£æ¥å(å°éº¦)</title> <style>body { text-align: center; padding: 10px @@ -72,7 +72,7 @@ <td>ç级</td> <td>foodLevel</td> <td>ç产年é</td> <td>scnx</td> <td>foodYear</td> </tr> <tr> <td>æ ·åæ°é</td> igds-web/src/main/resources/templates/test/qualityReport03.html
@@ -72,7 +72,7 @@ <td>ç级</td> <td>foodLevel</td> <td>ç产年é</td> <td>scnx</td> <td>foodYear</td> </tr> <tr> <td>æ ·åæ°é</td> igds-web/src/main/resources/templates/test/qualityReport04.html
@@ -72,7 +72,7 @@ <td>ç级</td> <td>foodLevel</td> <td>ç产年é</td> <td>scnx</td> <td>foodYear</td> </tr> <tr> <td>æ ·åæ°é</td>