分支自 igds-v4
上一版本: 5f6864fa | 补丁 | 提交 | 显示空白
jiazx0107@163.com
2023-06-29 651dfb24aa82ea28e6348907bc02dc8c84a6e13f 
Merge remote-tracking branch 'origin/master'
已修改10个文件
已添加2个文件
500 ■■■■■ 文件已修改
igds-core/src/main/java/models/igds.model.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/dto/WeightBill.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/service/HContractManageService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/models/InoutContract.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/in-handle.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/inout-print.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/admin/inout/in-card-back.html 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/test/qualityReport01.html 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/test/qualityReport02.html 166 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 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;


    //杂质增扣重




 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


@@ -25,7 +25,7 @@


        args.put("companyId", ContextUtil.getCompanyId());


        args.put("deptId", ContextUtil.subDeptId(null));




        if (null != param) {


        if (null != param && param.size() != 0) {


            String str = (String) param.get("type");


            if (StringUtils.isNotEmpty(str)) {


                hql += " and type =:type";


@@ -68,6 +68,10 @@


        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 {




 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(&quot;contractManagePR#triggerContractType&quot;).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(&quot;deptPR#loadParents&quot;).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(&quot;#dsParam.data&quot;);&#xD;


view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param.toJSON()).flushAsync();</ClientEvent>


@@ -460,8 +472,8 @@


            <Property name="iconClass">fa fa-refresh</Property>


          </Button>


          <Button>


            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({type:'1'});&#xD;


view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,{type:'1'}).flushAsync();</ClientEvent>


            <ClientEvent name="onClick">view.get(&quot;#dsParam&quot;).setData({});&#xD;


view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,{}).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


@@ -187,6 +187,10 @@


    @PropertyDef(label = "本方签约人")


    private String signUser;




    @Column(name = "PAY_TYPE_", length = 6)


    @PropertyDef(label = "支付方式")


    private String payType;




    /**


     * --------审批信息--------


     **/




 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,12 +289,12 @@


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


@@ -299,3 +302,38 @@


        }


    });


}




/**


 * å¼¹å‡ºæé†’框


 * @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();


    }


};










 igds-web/src/main/resources/templates/admin/inout/in-card-back.html


@@ -40,7 +40,7 @@




            <div class="rkbk-quick fl">


                <button class="rkbk-quick-btn layui-btn btn-green"


                        onclick="submit()">


                        onclick="submitData()">


                    <i><img th:src="@{../../static/images/icon-ok.png}"/></i> æ”¶å¡å‡ºåº“


                </button>


            </div>


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