分支自 igds-v4
上一版本: 9abb8808 | 补丁 | 提交 | 忽略空白
vince
2023-06-28 93bd5784309145cd20cd9e2641c0753c5db4eae8 
Merge remote-tracking branch 'origin/master'
已修改10个文件
已添加2个文件
491 ■■■■■ 文件已修改
igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/application-pro5326.yml 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/in-card-back.js 255 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/in-check.js 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/in-weight.js 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/admin/inout/inout-print.js 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/static/img/aerial-5326_001.png 补丁 | 查看 | 原始文档 | blame | 历史 
 igds-inout/src/main/java/com/ld/igds/inout/InoutBill.java


@@ -8,14 +8,13 @@


    /**


     * é»˜è®¤å…¥åº“过磅单


     */


    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'>承运人：</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 OUT_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}.sp1{width:33%;float:left;padding-bottom:10px}.sp2{width:25%;float:left;text-align:center}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'>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%'>deptName</td><td width='12.5%'>收货单位</td><td colspan='3'width='37.5%'>customerName</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>备注</td><td colspan='3'>remark</td><td>水分增重(KG)</td><td>deWet</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'>承运人：</span></div></body></html>";


    /**


     *


     * é»˜è®¤éªŒæ£€å•


     */


    public static String IN_CHECK_DEFAULT = "<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>出库化验单</title><style>body{text-align:center;padding:10px}h1{font-weight:400;font-size:24px;margin:5px}span{padding-bottom:10px}.div-tit{padding-top:10px}.div-tit2{padding-top:30px}.fl{float:left}.fr{float:right}.fp{margin-left:145px}.f2{float:left}table{width:100%;border-right:1px solid;border-bottom:1px solid}table td{border-left:1px solid;border-top:1px solid;height:30px;font-size:14px}</style></head><body><h1>billTitle</h1><div class='div-tit'><span class='fl'>发货单位：customerName</span><span>时间：time</span><span class='fr'>入库单号：serId</span></div><table cellspacing='0'cellpadding='0'><tr><td>品种</td><td>foodVariety</td><td>样品来源</td><td>现场扦样</td><td>车牌号</td><td>plateNum</td><td>承运人</td><td>userName</td><td></td></tr><tr><td>收货年份</td><td>foodYear</td><td>色泽气味</td><td>正常</td><td>入库仓号</td><td>depotName</td><td>粮食性质</td><td>商品粮</td><td></td></tr><tr><td>检验项目</td><td>标准值</td><td>检验值</td><td>检验项目</td><td>标准值</td><td>检验值</td><td>检验项目</td><td>标准值</td><td>检验值</td></tr><tr><td>容重g/l</td><td>C03_ST</td><td>C03_VAL</td><td>水分</td><td>C01_ST</td><td>C01_VAL</td><td>杂质</td><td>C02_ST</td><td>C02_VAL</td></tr><tr><td>出糙率%</td><td>C09_ST</td><td>C09_VAL</td><td>酸值</td><td>C22_ST</td><td>C22_VAL</td><td>过氧化值</td><td>C23_ST</td><td>C23_VAL</td></tr><tr><td>整精米率%</td><td>C10_ST</td><td>C10_VAL</td><td>不完善粒%</td><td>C04_ST</td><td>C04_VAL</td><td>溶剂残留量</td><td>C24_ST</td><td>C24_VAL</td></tr><tr><td>面筋吸水量</td><td>C08_ST</td><td>C08_VAL</td><td>谷外糙米%</td><td>C12_ST</td><td>C12_VAL</td><td>重金属(镉)</td><td>C25_ST</td><td>C25_VAL</td></tr><tr><td>脂肪酸值</td><td>C14_ST</td><td>C14_VAL</td><td>生霉率%</td><td>C29_ST</td><td>C29_VAL</td><td>黄粒米%</td><td>C11_ST</td><td>C11_VAL</td></tr><tr><td>呕吐毒素</td><td>C27_ST</td><td>C27_VAL</td><td>黄曲霉毒素B1</td><td>C28_ST</td><td>C28_VAL</td><td>重金属(ç ·)</td><td>C30_ST</td><td>C30_VAL</td></tr><tr><td>玉米赤霉烯酮</td><td>C31_ST</td><td>C31_VAL</td><td></td><td></td><td></td><td></td><td></td><td></td></tr><tr><td colspan=‘2’>检验结论及建议</td><td rowspan='8'colspan='8'></td></tr></table><div class='div-tit'><span class='fl'>检验员：checkUser</span><span class='fr'>承运人签字：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></div></body></html>";


@@ -68,7 +67,6 @@


    public static String IN_WEIGHT_5322 = "<!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:5px;font-size:24px;font-family:'宋体';padding-top:10px}.div-tit{padding-top:6px}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:32px}.sp1{width:33%;float:left;padding-bottom:5px}.sp2{width:25%;float:left;text-align:center}.txt-left{text-align:left}.txt-center{text-align:center}.txt-right{text-align:right}.bot{margin-bottom:10px}</style></head><body><h1 class='tit'>billTitle</h1><div class='div-tit'><span class='sp1 txt-left'>登记时间：registerTime</span><span class='sp1 txt-center'>完成时间：completeTime</span><span class='sp1 txt-right'>单号：serId</span></div><table cellspacing='0'cellpadding='0'><tr><td>车牌号</td><td>plateNum</td><td>皮重(公斤)</td><td>emptyWeight</td></tr><tr><td>大黄储备库</td><td>depotName</td><td>毛重(公斤)</td><td>fullWeight</td></tr><tr><td>供货单位</td><td>customerName</td><td>净重(公斤)</td><td>netWeight</td></tr><tr><td>收货单位</td><td>deptName</td><td>总扣重</td><td>deSum</td></tr><tr><td>货物名称</td><td>foodVariety</td><td>杂质(%)</td><td>impurity</td></tr><tr><td>包装规格</td><td></td><td>水分(%)</td><td>wet</td></tr><tr><td>包数</td><td></td><td>结算重量(公斤)</td><td>settleWeight</td></tr><tr><td>驾驶员</td><td>driverName</td><td>单价(元/公斤)</td><td>price</td></tr><tr><td>过磅时间</td><td>emptyTime</td><td>金额(元)</td><td>settleMoney</td></tr><tr><td>备注</td><td colspan='3'>remark</td></tr></table><div class='div-tit'><span class='sp2 txt-left bot'>司磅员：</span><span class='sp2 txt-left bot'>保管员：</span><span class='sp2 txt-left bot'>付款员：</span><span class='sp2 txt-left bot'>承运人：</span></div><div class='div-tit'style=\"margin-top: 10px\"><span class='sp2'>1.仓库（白）</span><span class='sp2'>2.付款（红）</span><span class='sp2'>3.客户（蓝）</span><span class='sp2'>4.农发行（黄）</span></div></body></html>";








    /**


     * é’神粮库出库过磅单


     */


@@ -78,7 +76,7 @@


    /**


     * ä¹‰ä¹Œå¸‚中心粮库出库称重单


     */


    public static String OUT_WEIGHT_5013 ="<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>出库过磅单</title>"


    public static String OUT_WEIGHT_5013 = "<!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;} "


            + "span {padding-bottom:10px;} "


@@ -94,7 +92,7 @@


    /**


     * ä¹‰ä¹Œå¸‚中心粮库入库称重单


     */


    public static String IN_WEIGHT_5013 ="<!DOCTYPE html><html lang='zh-cn'><head><meta http-equiv='Content-Type'content='text/html;charset=UTF-8'><title>入库过磅单</title>"


    public static String IN_WEIGHT_5013 = "<!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;} "


            + "span {padding-bottom:10px;} "


@@ -105,7 +103,7 @@


            + "table td {border-left:1px solid;border-top:1px solid;height:38px;}"


            + ".td-bottom {border-bottom:1px solid;}"


            + "</style></head>" +


            "<body><h1>billTitle</h1><span>时间：time</span><div class='div-tit'><span class='fl'>发货单位：customerName</span> <span class=''>单位编码：customerId</span><span class='fr'>入库单号：serId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>品种</td><td width='12.5%'>foodVariety</td><td width='12.5%'>承运车牌</td><td width='12.5%'>plateNum</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>transType</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>deHandle</td><td>包装扣重(KG)</td><td>dePack</td><td>不完善颗粒扣重(KG)</td><td>deBroken</td><td>杂质扣重(KG)</td><td>deImpurity</td></tr><tr><td>水分重量(KG)</td><td>deWet</td><td>其他扣重(KG)</td><td>deOther</td><td>总扣重(KG)</td><td>deSum</td><td>结算净重(KG)</td><td>settleWeight</td></tr><tr><td>发货包数</td><td></td><td class='td-bottom'>合同数量(KG)</td><td class='td-bottom'>planWeight</td><td class='td-bottom'>已交(KG)</td><td class='td-bottom'>completeWeight</td><td class='td-bottom'>完成百分比</td><td class='td-bottom'>completePer</td></tr><tr><td>备注</td><td rowspan='7' colspan='7'>remark</td></tr></table><div class='div-tit'><span class='fl'>司磅员：weightUser</span><span class=''>收货员：handleUser</span><span class='fr'>承运人：driverName</span></div></body>"+


            "<body><h1>billTitle</h1><span>时间：time</span><div class='div-tit'><span class='fl'>发货单位：customerName</span> <span class=''>单位编码：customerId</span><span class='fr'>入库单号：serId</span></div><table cellspacing='0'cellpadding='0'><tr><td width='12.5%'>品种</td><td width='12.5%'>foodVariety</td><td width='12.5%'>承运车牌</td><td width='12.5%'>plateNum</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>transType</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>deHandle</td><td>包装扣重(KG)</td><td>dePack</td><td>不完善颗粒扣重(KG)</td><td>deBroken</td><td>杂质扣重(KG)</td><td>deImpurity</td></tr><tr><td>水分重量(KG)</td><td>deWet</td><td>其他扣重(KG)</td><td>deOther</td><td>总扣重(KG)</td><td>deSum</td><td>结算净重(KG)</td><td>settleWeight</td></tr><tr><td>发货包数</td><td></td><td class='td-bottom'>合同数量(KG)</td><td class='td-bottom'>planWeight</td><td class='td-bottom'>已交(KG)</td><td class='td-bottom'>completeWeight</td><td class='td-bottom'>完成百分比</td><td class='td-bottom'>completePer</td></tr><tr><td>备注</td><td rowspan='7' colspan='7'>remark</td></tr></table><div class='div-tit'><span class='fl'>司磅员：weightUser</span><span class=''>收货员：handleUser</span><span class='fr'>承运人：driverName</span></div></body>" +


            "</html>";




    /**




 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java


@@ -321,7 +321,7 @@


        param.setIntelCard(data.getIntelCard());


        param.setUserId(data.getCompleteUser());


        param.setDepotId(data.getDepotId());


        param.setCompleteTime(data.getCompleteTime());


        param.setCompleteTime(new Date());


        param.setProgress(InoutConstant.PROGRESS_RECORD);




        String msg = inoutService.toComplete(param);


@@ -838,6 +838,11 @@




        curData.setProgress(curData.getProgress());


        curData.setType(curData.getType());


        curData.setFoodLevel(data.getFoodLevel());


        curData.setFoodVariety(data.getFoodVariety());


        curData.setPrice(data.getPrice());


        curData.setRemarks(data.getRemarks());


        curData.setCheckItems(data.getCheckItems());




        if (StringUtils.isEmpty(data.getCheckUser())) {


            curData.setCheckUser(ContextUtil.getLoginUserCName());




 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java


@@ -93,7 +93,7 @@


        htmlStr = htmlStr.replace("fullTime", bill.getFullTime());


        htmlStr = htmlStr.replace("emptyTime", bill.getEmptyTime());


        htmlStr = htmlStr.replace("serId", bill.getSerId());


        htmlStr = htmlStr.replace("specType", bill.getSpecType());


//        htmlStr = htmlStr.replace("specType", bill.getSpecType());




        htmlStr = htmlStr.replace("customerName", bill.getCustomerName());


        htmlStr = htmlStr.replace("deptName", bill.getUnitName());


@@ -261,7 +261,7 @@


        bill.setFullTime(DateFormatUtils.format(data.getFullWeightTime(),


                "yyyy-MM-dd HH:mm:ss"));


        bill.setSerId(data.getId());


//        bill.setSpecType(StringUtils.isEmpty(data.getSpecType())?"散粮":data.getSpecType());


//        bill.setSpecType(StringUtils.isEmpty(data.getSpecType()) ? "散粮" : data.getSpecType());


        if ("5016".equals(data.getCompanyId())) {


            bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(), "yyyy-MM-dd"));


            bill.setSerId(data.getId().substring(2));


@@ -269,7 +269,7 @@


        }




        //客户信息


       // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());


        // bill.setCustomerId(data.getCustomerId() == null ? "" : data.getCustomerId());


        bill.setCustomerName(data.getCustomerName() == null ? "" : data.getCustomerName());


        bill.setUserId(data.getUserId() == null ? "" : data.getUserId());


        bill.setUserAddress(data.getUserAddress() == null ? "" : data.getUserAddress());


@@ -277,7 +277,7 @@




        //从通知单中获取收发货单位信息


        NoticeDto noticeDto = noticeService.queryNoticeById(data.getNoticeId(), data.getType());


        if(null != noticeDto && StringUtils.isNotEmpty(noticeDto.getUnitName())){


        if (null != noticeDto && StringUtils.isNotEmpty(noticeDto.getUnitName())) {


            bill.setUnitName(noticeDto.getUnitName());


        }




@@ -315,13 +315,13 @@


//            bill.setImpurity(data.getImpurity()+"");


//        }




        bill.setPrice(data.getPrice()== null ? "" :data.getPrice() + "");


        if(data.getSettleMoney() <= 0){


            if(null != data.getPrice() && null != data.getRecordWeight()){


                data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice()*data.getRecordWeight(),2));


        bill.setPrice(data.getPrice() == null ? "" : data.getPrice() + "");


        if (data.getSettleMoney() <= 0) {


            if (null != data.getPrice() && null != data.getRecordWeight()) {


                data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2));


            }


        }


        bill.setSettleMoney(data.getSettleMoney()== null ? "" :data.getSettleMoney()+"");


        bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");


        bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());




        return bill;


@@ -373,7 +373,7 @@


        String key;


        for (CheckItemData item : checkLst) {


            key = item.getStandardId() + "_ST";


           // checkBillItems.put(key, item.getStandardValue());


            // checkBillItems.put(key, item.getStandardValue());


            key = item.getStandardId() + "_VAL";


            checkBillItems.put(key, item.getValue());


        }


@@ -449,7 +449,7 @@


    public String inSettleBill(InoutData data, InoutSettle settle) {




        if (null != data) {


          //  settle.setCompleteTime(data.getCompleteTime());


            //  settle.setCompleteTime(data.getCompleteTime());


            settle.setDepotId(data.getDepotId());


            settle.setDeptId(data.getDeptId());


//            settle.setUserName(data.getUserName());


@@ -614,18 +614,18 @@


        }




        String htmlStr;


        if(list.size() <= 30){


        if (list.size() <= 30) {


            //只有一页时


            htmlStr = getShipBill(data, list, true,0);


            htmlStr = getShipBill(data, list, true, 0);


            result.add(htmlStr);


        }else {


        } else {


            //有多页时


            int page = list.size()/30 + 1;


            int page = list.size() / 30 + 1;


            for (int i = 1; i <= page; i++) {


                if(i == page){


                    htmlStr = getShipBill(data, list.subList((i-1)*30, list.size()),true, i);


                }else {


                    htmlStr = getShipBill(data, list.subList((i-1)*30, i*30),false, i);


                if (i == page) {


                    htmlStr = getShipBill(data, list.subList((i - 1) * 30, list.size()), true, i);


                } else {


                    htmlStr = getShipBill(data, list.subList((i - 1) * 30, i * 30), false, i);


                }


                result.add(htmlStr);


            }


@@ -636,6 +636,7 @@




    /**


     * èŽ·å–船运打印模板数据


     *


     * @param data    æµæ°´ä¿¡æ¯


     * @param list    è½¦è¾†ä¿¡æ¯ï¼Œæ•°é‡ä¸å¤§äºŽ30


     * @param moreTag ç»“算标签，true-代表结算页；false-不是结算页


@@ -646,7 +647,7 @@




        //调整模版数据并返回


        String htmlStr = InoutBill.SHIP_WEIGHT_DEFAULT_MORE;


        if(moreTag){


        if (moreTag) {


            htmlStr = InoutBill.SHIP_WEIGHT_DEFAULT;


        }




@@ -654,7 +655,7 @@




        //表头


        String billTitle = (dept == null ? "船运过磅单" : dept.getName() + "船运过磅单");


        if(0 != pageNum){


        if (0 != pageNum) {


            billTitle += " - ç¬¬" + pageNum + "页";


        }


        htmlStr = htmlStr.replace("billTitle", billTitle);


@@ -695,7 +696,7 @@


        }




        //添加结算信息


        if(moreTag){


        if (moreTag) {


            htmlStr = htmlStr.replace("handleUser", depot == null ? "" : (depot.getStoreKeeperName() == null ? "" : depot.getStoreKeeperName()));


            htmlStr = htmlStr.replace("remarks", data.getRemarks() == null ? "" : data.getRemarks());


            htmlStr = htmlStr.replace("fullWeight", new DecimalFormat("0").format(data.getFullWeight()));




 igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java


@@ -107,7 +107,7 @@


            args.put("startTime", DateUtil.getCurZero(date));


            args.put("endTime", DateUtil.getNextZero(date));


        }


        hql += " order by  updateTime desc";


        hql += " order by  updateTime desc limit 20";


        return this.query(hql, args);


    }






 igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java


@@ -123,7 +123,7 @@


            args.put("endTime", DateUtil.getNextZero(date));


        }




        hql += " order by  updateTime desc";


        hql += " order by  updateTime desc limit 20";


        return this.query(hql, args);


    }






 igds-inout/src/main/resources/mapper/InoutRecordMapper.xml


@@ -156,7 +156,7 @@


            </if>


        </where>


        AND RECORD_STATUS_ != 'DEL'


        ORDER BY COMPLETE_TIME_ DESC


        ORDER BY UPDATE_TIME_ DESC


        LIMIT 1


    </select>




@@ -220,6 +220,7 @@


        <if test="data.checkStatus != null">CHECK_STATUS_ = #{data.checkStatus},</if>


        <if test="data.checkId != null">CHECK_ID_ = #{data.checkId},</if>


        <if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if>


        <if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if>


        <if test="data.registerTime != null">REGISTER_TIME_ = #{data.registerTime},</if>


        <if test="data.registerUser != null">REGISTER_USER_ = #{data.registerUser},</if>


        <if test="data.userName != null">USER_NAME_ = #{data.userName},</if>


@@ -235,10 +236,12 @@


        <if test="data.customerName != null">CUSTOMER_NAME_ = #{data.customerName},</if>


        <if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>


        <if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>


        <if test="data.foodLocationId != null">FOOD_LOCATION_ID_ = #{data.foodLocationId},</if>


        <if test="data.foodLocation != null">FOOD_LOCATION_ = #{data.foodLocation},</if>


        <if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>


        <if test="data.deHandle != null">DE_HANDLE_ = #{data.deHandle},</if>


        <if test="data.deOther != null">DE_OTHER_ = #{data.deOther},</if>


        <if test="data.deOtherInfo != null">DE_OTHER_INTO_ = #{data.deOtherInfo},</if>


        <if test="data.fullWeight != null">FULL_WEIGHT_ = #{data.fullWeight},</if>


        <if test="data.fullWeightTime != null">FULL_WEIGHT_TIME_ = #{data.fullWeightTime},</if>


        <if test="data.fullWeightUser != null">FULL_WEIGHT_USER_ = #{data.fullWeightUser},</if>


@@ -246,6 +249,7 @@


        <if test="data.emptyWeightTime != null">EMPTY_WEIGHT_TIME_ = #{data.emptyWeightTime},</if>


        <if test="data.emptyWeightUser != null">EMPTY_WEIGHT_USER_ = #{data.emptyWeightUser},</if>


        <if test="data.netWeight != null">NET_WEIGHT_ = #{data.netWeight},</if>


        <if test="data.settleId != null">SETTLE_ID_ = #{data.settleId},</if>


        <if test="data.settleWeight != null">SETTLE_WEIGHT_ = #{data.settleWeight},</if>


        <if test="data.recordWeight != null">RECORD_WEIGHT_ = #{data.recordWeight},</if>


        <if test="data.handleUser != null">HANDLE_USER_ = #{data.handleUser},</if>


@@ -254,6 +258,8 @@


        <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>


        <if test="data.foodType != null">FOOD_TYPE_ = #{data.foodType},</if>


        <if test="data.price != null">PRICE_ = #{data.price},</if>


        <if test="data.bzw != null">bzw = #{data.bzw},</if>


        <if test="data.dbz != null">dbz = #{data.dbz},</if>


        <if test="data.settleMoney != null">SETTLE_MONEY_ = #{data.settleMoney},</if>


        PROGRESS_ = #{data.progress}


        where




 igds-web/src/main/resources/application-pro5326.yml


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,80 @@


##########################  å¹¿ä¸œæƒ å·žæƒ æ–°ç²®åº“项目   ##########################


server:


  port: 8888


  context-path: /


  connection-timeout: 5000


  tomcat:


    uri-encoding: UTF-8




##########################  datasourcec   ##########################


spring:


  datasource:


    db-base:


      name: db-base


      type: com.alibaba.druid.pool.DruidDataSource


      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8


      driver-class-name: com.mysql.jdbc.Driver


      username: root


      password: ukJp12Qf+elyBvGHkJ5MQMa95pfVm0oFBHefdEgDFKoFSjbgYa9PYfv5vlem5nvoXjQsP9tIIo53DvSbsl160Q==


      public-key:


      config-decrypt: true


      initial-size:  5


      min-idle:  5


      max-active:  50


      max-wait: 60000


      time-between-eviction-runs-millis: 60000


      min-evictable-idle-time-millis: 300000


      validation-query: select 1 from dual


      test-whileIdle: true


      test-on-borrow: false


      test-on-return: false


      pool-prepared-statements: true


      max-pool-prepared-statement-per-connection-size: 20


      filters: stat


      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000


      use-global-data-source-stat: true


      removeAbandoned: true


      removeAbandonedTimeout: 90


      logAbandoned: true


      poolPreparedStatements: true


      maxPoolPreparedStatementPerConnectionSize: 20


    db-sqlite:


      name: db-sqlite


      url: jdbc:sqlite:D:/app/igds/db/iot_cfg.db


      driver-class-name: org.sqlite.JDBC


      type: com.alibaba.druid.pool.DruidDataSource


      username:


      password:




  # Redis相关配置


  redis:


    database: 0


    host: 127.0.0.1


    port: 6379


    password: Abc123..


    # è¿žæŽ¥æ± æœ€å¤§è¿žæŽ¥æ•°ï¼ˆä½¿ç”¨è´Ÿå€¼è¡¨ç¤ºæ²¡æœ‰é™åˆ¶ï¼‰


    pool:


      max-active: 200


      max-wait: -1


      max-idle: 10


      min-idle: 0


      timeout: 6000




license:


  subject: ld_license


  publicAlias: publicCert


  storePass: PUBLICFZZYXXJSGFYXGS888888


  licensePath: D:/IGDS/license/license.lic


  publicKeysStorePath: D:/IGDS/license/publicCerts.keystore




##########################  IGDS   ##########################


## ç³»ç»ŸæŽ¥å£è·¯ç”±é…ç½® æ³¨æ„æ•°å­—如果以0开头的话，后台会出现转义，请添加""


igds:


  default:


    companyId: 5326


    sys-name: æ™ºæ…§ç²®åº“管理系统


    logo: logo-default.png


    logo-title: logo-title-default.png


    support: æ™ºæ…§ç²®æƒ…粮情云管理平台


    grian-add-point: N


  file-path: D:/IGDS/FILE/




 igds-web/src/main/resources/static/admin/inout/in-card-back.js


@@ -2,161 +2,162 @@


var layer;


var form;


var recordData = null;


$(function() {


    layui.use([ 'layer', 'laydate', 'form' ], function() {


        layer = layui.layer;


        form = layui.form;


        layui.laydate.render({


            elem : '#test1',


            theme : '#7b8e9f'


        });


$(function () {


    layui.use(['layer', 'laydate', 'form'], function () {


        layer = layui.layer;


        form = layui.form;


        layui.laydate.render({


            elem: '#test1',


            theme: '#7b8e9f'


        });




    });


    });




    showProgress();


    showProgress();


});




//使用插件读取智慧卡号


function flushICCard() {


    var index = layer.load();


    $("#intelCard").val(null);


    $.ajax({


        type: "GET",


        async: true,


        url: "http://127.0.0.1:9111/ICCARD",


        data: {},


        dataType: "jsonp",


        jsonp: "callback",


        jsonpCallback: "jsonpCallback",


        success: function (json) {


            layer.close(index);


            var data = json.no;


            if (data === "not found") {


                alertError("请重新读卡！");


            } else {


                $("#intelCard").val(data);


    var index = layer.load();


    $("#intelCard").val(null);


    $.ajax({


        type: "GET",


        async: true,


        url: "http://127.0.0.1:9111/ICCARD",


        data: {},


        dataType: "jsonp",


        jsonp: "callback",


        jsonpCallback: "jsonpCallback",


        success: function (json) {


            layer.close(index);


            var data = json.no;


            if (data === "not found") {


                alertError("请重新读卡！");


            } else {


                $("#intelCard").val(data);




                //直接刷新数据


                flushData();


            }


        },


        error: function () {


            layer.close(index);


            alertError("IC卡读取出错！");


        }


    });


                //直接刷新数据


                flushData();


            }


        },


        error: function () {


            layer.close(index);


            alertError("IC卡读取出错！");


        }


    });


}






//使用插件读取身份证


function flushIdCard() {


    var index = layer.load();


    $.ajax({


        type: "GET",


        async: true,


        url: "http://127.0.0.1:9111/IDCARD",


        data: {},


        dataType: "jsonp",


        jsonp: "callback",


        jsonpCallback: "jsonpCallback",


        success: function (json) {


            layer.close(index);


            var data = json.content;


            if (data === "not found") {


                alertError("没有获取到身份证信息！");


                return;


            }


            $("#userId").val(data.idNum);


            flushData();


        },


        error: function () {


            layer.close(index);


            alertError("身份证读取失败！");


        }


    });


    var index = layer.load();


    $.ajax({


        type: "GET",


        async: true,


        url: "http://127.0.0.1:9111/IDCARD",


        data: {},


        dataType: "jsonp",


        jsonp: "callback",


        jsonpCallback: "jsonpCallback",


        success: function (json) {


            layer.close(index);


            var data = json.content;


            if (data === "not found") {


                alertError("没有获取到身份证信息！");


                return;


            }


            $("#userId").val(data.idNum);


            console.log(data)


            flushData();


        },


        error: function () {


            layer.close(index);


            alertError("身份证读取失败！");


        }


    });


}




// è¡¨å•æ¸…空


function resetForm() {


    $("#form-data")[0].reset();


    $("#form-basic")[0].reset();


    $("#form-data")[0].reset();


    $("#form-basic")[0].reset();




    form.render();


    form.render();




    recordData = null;


    recordData = null;


}




// æ›´æ–°æ•°æ®ä¿¡æ¯


function flushData() {


    var index = layer.load();


    var plateNum = $("#plateNum").val();


    var userId2 = $("#userId").val();


    var intelCard = $("#intelCard").val();


    var index = layer.load();


    var plateNum = $("#plateNum").val();


    var userId2 = $("#userId").val();


    var intelCard = $("#intelCard").val();




    var param = {


        type : type,


        progress : progress,


        userId: userId2,


        intelCard: intelCard,


        plateNum : plateNum


    };


    var param = {


        type: type,


        progress: progress,


        userId: userId2,


        intelCard: intelCard,


        plateNum: plateNum


    };




    $.ajax({


        type : "POST",


        url : "../../basic/inout/inout-query-back",


        dataType : "json",


        contentType : "application/json;charset=UTF-8",


        data : JSON.stringify(param),


        success : function(result) {


            if (result.code != "0000") {


                layer.alert(result.msg);


            } else {


                recordData = result.data;


                // è¿”回的数据进行赋值


                form.val("form-data", recordData);


                form.val("form-basic", recordData);


                form.render();


            }


            layer.close(index);


        },


        error : function() {


            layer.close(index);


            alertError("查询失败，请重新尝试！")


        }


    });


    $.ajax({


        type: "POST",


        url: "../../basic/inout/inout-query-back",


        dataType: "json",


        contentType: "application/json;charset=UTF-8",


        data: JSON.stringify(param),


        success: function (result) {


            if (result.code != "0000") {


                layer.alert(result.msg);


            } else {


                recordData = result.data;


                // è¿”回的数据进行赋值


                form.val("form-data", recordData);


                form.val("form-basic", recordData);


                form.render();


            }


            layer.close(index);


        },


        error: function () {


            layer.close(index);


            alertError("查询失败，请重新尝试！")


        }


    });


}




// å½“前完成


function submitData() {


    if (!recordData) {


        alertError("没有数据可以提交！");


        return;


    }


    if (!recordData) {


        alertError("没有数据可以提交！");


        return;


    }




    // æäº¤æ•°æ®æ¯”较特殊，不用考虑基本信息提交


    var index = layer.load();


    var data = form.val("form-data");


    Object.assign(recordData, data);


    // æäº¤æ•°æ®æ¯”较特殊，不用考虑基本信息提交


    var index = layer.load();


    var data = form.val("form-data");


    Object.assign(recordData, data);




    $.ajax({


        type : "POST",


        url : "../../basic/inout/submit-card-back",


        dataType : "json",


        contentType : "application/json;charset=UTF-8",


        data : JSON.stringify(recordData),


        success : function(result) {


            if (result.code != "0000") {


                layer.msg(result.msg);


            } else {


                layer.alert("卡片回收成功！");


                // é‡ç½®é¡µé¢


                resetForm();


            }


            layer.close(index);


        },


        error : function() {


            layer.close(index);


            layer.msg("卡片回收失败，请重新尝试！！");


        }


    });


    $.ajax({


        type: "POST",


        url: "../../basic/inout/submit-card-back",


        dataType: "json",


        contentType: "application/json;charset=UTF-8",


        data: JSON.stringify(recordData),


        success: function (result) {


            if (result.code != "0000") {


                layer.msg(result.msg);


            } else {


                layer.alert("卡片回收成功！");


                // é‡ç½®é¡µé¢


                resetForm();


            }


            layer.close(index);


        },


        error: function () {


            layer.close(index);


            layer.msg("卡片回收失败，请重新尝试！！");


        }


    });


}




 igds-web/src/main/resources/static/admin/inout/in-check.js


@@ -288,6 +288,7 @@


        }


    });


};




// æ‰¦æ ·æœºè§£é™¤æ€¥åœ


function checkResetStop() {


    var param = JSON.stringify(checkDto);


@@ -312,6 +313,7 @@


        }


    });


};




//隐藏信息--替换为*


function replaceStr(str) {


    if (!str) {


@@ -332,7 +334,7 @@


    curCheckData = obj.data;




    curSampleData = obj.data;


    if(!curCheckData.checkTime){


    if (!curCheckData.checkTime) {


        curCheckData.checkTime = dateFtt("yyyy-MM-dd hh:mm:ss", new Date());


    }


    curCheckData.checkUser = checkUser;


@@ -786,4 +788,39 @@


    });


};




/**


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


 * @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/in-weight.js


@@ -145,11 +145,9 @@


            alertError("后台调用截图失败，请重新尝试");


        }


    });


    console.log(recordData.progress, "空车称重")


    //如果是第二次称重，默认执行自动计算


    if (InoutProgress.WEIGHT_EMPTY == recordData.progress) {


        deAutoByIn("emptyWeight");


        console.log("空车称重")


    }


}




@@ -546,6 +544,41 @@


}




/**


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


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


    }


}




/**


 * æ¸²æŸ“表格


 */


function renderTableCheckItem() {




 igds-web/src/main/resources/static/admin/inout/inout-print.js


@@ -2,9 +2,13 @@


 * æ‰“印过磅单


 */


printWeight = function (htmlStr) {


    var LODOP = CLODOP;


    // var LODOP = CLODOP


    var LODOP = getLodop();


    if ("5016" == companyId) {


        LODOP.PRINT_INIT("称重单");


        //值为1--纵向打印，固定纸张;


        // å€¼ä¸º2--横向打印，固定纸张;


        // å€¼ä¸º3--纵向打印，固定宽度，高度按打印内容的高度自适应;


        LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");


        LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);


        LODOP.PREVIEW();




 igds-web/src/main/resources/static/img/aerial-5326_001.png