~admin/igds-v4.git

YYC

2023-07-04 585e878b169bdeb2bc8cc452b9d2e640d00caa6d

质检报告

已修改12个文件

	igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java	99 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.js	176 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/m/view/InoutCustomer.view.xml	75 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/models/inout.model.xml	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/test/qualityReport01.html	38 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/test/qualityReport02.html	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/test/qualityReport03.html	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-web/src/main/resources/templates/test/qualityReport04.html	40 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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'>单号：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_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'>编码：serId</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>容重（g/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>玉米赤霉烯酮（μg/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'>单号：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_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'>编码：serId</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（μg/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'>单号：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_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'>编码：serId</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>容重（g/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>玉米赤霉烯酮（μg/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'>单号：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>";
    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'>编码：serId</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>";
    /**
     * 默认结算单
     */

 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();
        // 遍历化验结果，存入map集合中
        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;
    }


 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);
};

 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>

 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/>

 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(&quot;#dsMain.data:#&quot;);&#xD;

 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>

 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(&quot;deptPR#loadParents&quot;).getResult()}</Property>
      </Property>
    </PropertyDef>
    <PropertyDef name="khlx">
      <Property/>
      <Property name="label">客户类型</Property>
      <Property name="mapping">
        <Property name="mapValues">${dorado.getDataProvider(&quot;contractManagePR#triggerCustomerType&quot;).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">

 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'>单号：serId</span></div>
<body><h1 class='tit'>质检报告(foodVariety)</h1>
<div class='div-tit'>单号：serId</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（μg/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>

 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'>单号：serId</span></div>
<div class='div-tit'>单号：serId</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>容重（g/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>玉米赤霉烯酮（μg/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>

 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'>单号：serId</span></div>
<div class='div-tit'>单号：serId</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>容重（g/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>玉米赤霉烯酮（μg/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>

 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'>单号：serId</span></div>
<div class='div-tit'>单号：serId</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>

			@@ -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();
			// 遍历化验结果，存入map集合中
			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;
			}

			@@ -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);
			};

			@@ -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>

			@@ -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/>

			@@ -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:#");

			@@ -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>

			@@ -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">

			@@ -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'>单号：serId</span></div>
			<body><h1 class='tit'>质检报告(foodVariety)</h1>
			<div class='div-tit'>单号：serId</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（μg/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>