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> 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'>ç»è®°æ¶é´ï¼registerTime</span><span class='sp1'>å®ææ¶é´ï¼completeTime</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>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'>ç»è®°æ¶é´ï¼registerTime</span><span class='sp1'>å®ææ¶é´ï¼completeTime</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>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'>åå·ï¼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-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 = ""; //ä¿ç®¡å 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()); 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; } } 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> 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 = "æ ¼å¼ï¼yyyy-MM-dd") private Date signingTime; @Column(name = "SIGNING_TIME_") @PropertyDef(label = "ç¾è®¢æ¶é´", description = "æ ¼å¼ï¼yyyy-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 = "æ ¼å¼ï¼yyyy-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 = "æ ¼å¼ï¼yyyy-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; } 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']}); } } 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(); } };
@@ -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" 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'>åå·ï¼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> 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'>åå·ï¼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>
