出入库报表

YYC

2023-06-30 29ec252deaf466bc2c8cbc110221547da8790e8d

出入库报表

 igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java

@@ -105,7 +105,6 @@
        sql.append("COMPANY_ID_ = :companyId ");
        sql.append("AND PROGRESS_ = :progress ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusDel  ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusError ");
        sql.append("AND COMPLETE_TIME_ >= :start ");
        sql.append("AND COMPLETE_TIME_ <= :end ");
        sql.append("AND DEPT_ID_  = :deptId ");
@@ -168,7 +167,6 @@
        sql.append("COMPANY_ID_ =:companyId ");
        sql.append("AND PROGRESS_ =:progress ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusDel ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusError ");
        sql.append("AND DEPT_ID_ = :deptId ");
        sql.append("AND COMPLETE_TIME_ < :start ");
        sql.append("ORDER BY COMPLETE_TIME_ DESC ");
@@ -219,7 +217,6 @@
        sql.append("COMPANY_ID_ =:companyId ");
        sql.append("AND PROGRESS_ =:progress ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusDel ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusError ");
        sql.append("AND DEPT_ID_ = :deptId ");
        sql.append("AND COMPLETE_TIME_ <:end ");
        sql.append("ORDER BY COMPLETE_TIME_ DESC ");
@@ -416,7 +413,6 @@
        sql.append("COMPANY_ID_ =:companyId ");
        sql.append("AND PROGRESS_ =:progress ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusDel ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusError ");
        sql.append("AND COMPLETE_TIME_ >= :start ");
        sql.append("AND COMPLETE_TIME_ <= :end ");
        sql.append("AND DEPT_ID_  = :deptId ");
@@ -471,7 +467,6 @@
        sql.append("COMPANY_ID_ =:companyId ");
        sql.append("AND PROGRESS_ =:progress ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusDel ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusError ");
        sql.append("AND DEPT_ID_ = :deptId ");
        sql.append("AND COMPLETE_TIME_ < :start ");
        sql.append("ORDER BY COMPLETE_TIME_ DESC ");
@@ -523,7 +518,6 @@
        sql.append("COMPANY_ID_ =:companyId ");
        sql.append("AND PROGRESS_ =:progress ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusDel ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusError ");
        sql.append("AND DEPT_ID_ = :deptId ");
        sql.append("AND COMPLETE_TIME_ < :end ");
        sql.append("ORDER BY COMPLETE_TIME_ DESC ");
@@ -692,7 +686,6 @@
        sql.append("WHERE ");
        sql.append("TRANS_TYPE_ =:transType ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusDel ");
        sql.append("AND RECORD_STATUS_ <> :recordStatusError ");
        sql.append("AND TYPE_ <> :typeNone ");
        sql.append("AND TYPE_ <> :typeLoss ");
        sql.append("AND TYPE_ <> :typeOver ");

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutReportPR.java

@@ -19,12 +19,10 @@
import com.ld.igds.util.DateUtil;

/**
 * 
 * @author: andy.jia
 * @description:
 * @version:
 * @data:2020å¹´3月13日
 *
 */
@Component
public class InoutReportPR {
@@ -183,12 +181,14 @@
            return result;

        // æ·»åŠ ç»Ÿè®¡ä¿¡æ¯
        double emptyWeightSum = 0.0, fullWeightSum = 0.0, deWetSum = 0.0, deImpuritySum = 0.0, deHandleSum = 0.0,  deOtherSum = 0.0, deSumSum = 0.0, netWeightSum = 0.0, settleWeightSum = 0.0;
        double emptyWeightSum = 0.0, fullWeightSum = 0.0, deCheck = 0.0, addCheck = 0.0, deWetSum = 0.0, deImpuritySum = 0.0, deHandleSum = 0.0, deOtherSum = 0.0, deSumSum = 0.0, netWeightSum = 0.0, settleWeightSum = 0.0;
        int index = 1;
        for (InoutRecord record : result) {
            record.setRemarks(String.valueOf(index));
            emptyWeightSum += record.getEmptyWeight();
            fullWeightSum += record.getFullWeight();
            deCheck += record.getDeCheck();
            addCheck += record.getAddCheck();
//            deWetSum += record.getDeWet();
//            deImpuritySum += record.getDeImpurity();
            deHandleSum += record.getDeHandle();
@@ -202,6 +202,8 @@
        sum.setId("合计");
        sum.setEmptyWeight(emptyWeightSum);
        sum.setFullWeight(fullWeightSum);
        sum.setAddCheck(addCheck);
        sum.setDeCheck(deCheck);
//        sum.setDeWet(deWetSum);
//        sum.setDeImpurity(deImpuritySum);
        sum.setDeHandle(deHandleSum);
@@ -216,6 +218,7 @@

    /**
     * inoutReportPR#inoutDepotData åˆ†ä»“粮油收支存
     *
     * @param param
     * @return
     */
@@ -224,8 +227,10 @@
        List<ReportInoutDepotData> result = jdbcReportService.getInoutDepotData(param);
        return result;
    }

    /**
     * inoutReportPR#inoutFoodVarietyData åˆ†å“ç§ç²®æ²¹æ”¶æ”¯å­˜
     *
     * @param param
     * @return
     */

 igds-inout/src/main/java/com/ld/igds/inout/view/ReportInDay.view.xml

@@ -251,6 +251,18 @@
          <Property name="width">100</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="align">center</Property>
          <Property name="name">addCheck</Property>
          <Property name="property">addCheck</Property>
          <Editor/>
        </DataColumn>
        <DataColumn>
          <Property name="align">center</Property>
          <Property name="name">deCheck</Property>
          <Property name="property">deCheck</Property>
          <Editor/>
        </DataColumn>
        <DataColumn name="fullWeight">
          <Property name="property">fullWeight</Property>
          <Property name="caption">毛重</Property>
@@ -265,21 +277,16 @@
          <Property name="property">netWeight</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="deWet">
          <Property name="property">deWet</Property>
          <Property name="caption">水分</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">deSum</Property>
          <Property name="align">center</Property>
          <Property name="name">deSum</Property>
        </DataColumn>
        <DataColumn name="settleWeight">
          <Property name="property">settleWeight</Property>
          <Property name="caption">结算重量</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">completeTime</Property>
          <Property name="align">center</Property>
          <Property name="name">completeTime</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Export2ReportAction id="exportExcel">

 igds-inout/src/main/java/com/ld/igds/inout/view/ReportInoutDetail.view.xml

@@ -41,8 +41,8 @@
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="name"/>
                <Property name="value"/>
                <Property name="name"></Property>
                <Property name="value"></Property>
              </Entity>
              <Entity>
                <Property name="name">出库</Property>
@@ -306,21 +306,16 @@
          <Property name="property">netWeight</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">deSum</Property>
          <Property name="align">center</Property>
          <Property name="name">deSum</Property>
        </DataColumn>
        <DataColumn name="deWet">
          <Property name="property">deWet</Property>
          <Property name="caption">水分</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="settleWeight">
          <Property name="property">settleWeight</Property>
          <Property name="caption">结算重量</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">completeTime</Property>
          <Property name="align">center</Property>
          <Property name="name">completeTime</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Export2ReportAction id="exportExcel">

 igds-inout/src/main/java/com/ld/igds/inout/view/ReportOutDay.view.xml

@@ -251,6 +251,18 @@
          <Property name="width">100</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="align">center</Property>
          <Property name="name">addCheck</Property>
          <Property name="property">addCheck</Property>
          <Editor/>
        </DataColumn>
        <DataColumn>
          <Property name="align">center</Property>
          <Property name="name">deCheck</Property>
          <Property name="property">deCheck</Property>
          <Editor/>
        </DataColumn>
        <DataColumn name="fullWeight">
          <Property name="property">fullWeight</Property>
          <Property name="caption">毛重</Property>
@@ -265,21 +277,16 @@
          <Property name="property">netWeight</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="deWet">
          <Property name="property">deWet</Property>
          <Property name="caption">水分</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">deSum</Property>
          <Property name="align">center</Property>
          <Property name="name">deSum</Property>
        </DataColumn>
        <DataColumn name="settleWeight">
          <Property name="property">settleWeight</Property>
          <Property name="caption">结算重量</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn>
          <Property name="property">completeTime</Property>
          <Property name="align">center</Property>
          <Property name="name">completeTime</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Export2ReportAction id="exportExcel">

 igds-web/src/main/resources/templates/test/qualityReport02.html

@@ -102,40 +102,35 @@
        <td>bgcjsj</td>
    </tr>
    <tr>
        <td rowspan="7">质检结果</td>
        <td rowspan="4">质量指标检验</td>
        <td rowspan="6">质检结果</td>
        <td rowspan="3">质量指标检验</td>
        <td>品种</td>
        <td>foodVariety</td>
        <td>出糙率（%）</td>
        <td>rough</td>
        <td>容重（g/L）</td>
        <td>bulkWeight</td>
        <td>等级</td>
        <td>foodLevel</td>
    </tr>
    <tr>
        <td>整精米率（%）</td>
        <td>C10_ST</td>
        <td>色泽、气味</td>
        <td>C16_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>
        <td>不完善粒（%）</td>
        <td>C04_ST</td>
        <td>生芽粒（%）</td>
        <td>C05_ST</td>
        <td>生霉粒（%）</td>
        <td>C06_ST</td>
    </tr>
    <tr>
        <td>储存品质检验</td>
        <td>脂肪酸值（mgKOH/100g）</td>
        <td>C14_ST</td>
        <td>面筋吸水量（%）</td>
        <td>C08_ST</td>
        <td>品尝分值</td>
        <td>C15_ST</td>
        <td>色泽、气味</td>
@@ -143,19 +138,20 @@
    </tr>
    <tr>
        <td rowspan="2">食品安全检验</td>
        <td>黄曲霉毒素 B1（μg/kg）</td>
        <td>C17_ST</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>
        <td>镉（mg/kg）</td>
        <td>C19_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>
        <td colspan="2"></td>
    </tr>
    <tr>
        <td colspan="2">备注</td>

 igds-web/src/main/resources/templates/test/qualityReport03.html

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,162 @@
<!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>

 igds-web/src/main/resources/templates/test/qualityReport04.html

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,152 @@
<!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>