分支自 igds-v4
上一版本: e4609e7e | 补丁 | 提交 | 忽略空白
YYC
2023-07-21 d54186539b00fab8f4b639752aaf9b758c914ffd 
出入库检斤、货位卡
已修改4个文件
已添加3个文件
509 ■■■■■ 文件已修改
igds-core/src/main/java/com/ld/igds/models/Building.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-core/src/main/java/com/ld/igds/models/DepotStore.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-core/src/main/java/com/ld/igds/view/Building.view.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-core/src/main/java/models/igds.model.xml 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/test/TCheckPoundIn.html 216 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/test/TCheckPoundOut.html 148 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-web/src/main/resources/templates/test/TDepot.html 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 igds-core/src/main/java/com/ld/igds/models/Building.java


@@ -36,9 +36,9 @@


    @PropertyDef(label = "组织编码")


    private String companyId;




    @Column(name = "gbm", length = 50)


    @PropertyDef(label = "廒间国别码")


    private String gbm;


    @Column(name = "ggm", length = 50)


    @PropertyDef(label = "国规码")


    private String ggm;




    @Column(name = "DEPT_ID_", length = 40)


    @PropertyDef(label = "所属库点")




 igds-core/src/main/java/com/ld/igds/models/DepotStore.java


@@ -118,12 +118,12 @@


    @Column(name = "UPDATE_USER_", length = 50)


    @PropertyDef(label = "修改人")


    private String updateUser;


   






    @Column(name = "UPDATE_DATE_")


    @PropertyDef(label = "修改时间")


    private Date updateDate;


    




    @Column(name = "CREATE_DATE_")


    private Date createDate;






 igds-core/src/main/java/com/ld/igds/view/Building.view.xml


@@ -153,8 +153,8 @@


            <Editor/>


          </AutoFormElement>


          <AutoFormElement>


            <Property name="name">gbm</Property>


            <Property name="property">gbm</Property>


            <Property name="name">ggm</Property>


            <Property name="property">ggm</Property>


            <Editor/>


          </AutoFormElement>


          <AutoFormElement>


@@ -176,7 +176,6 @@


          <AutoFormElement>


            <Property name="name">roofTruss</Property>


            <Property name="property">roofTruss</Property>


            <Property name="trigger">ddCustomer</Property>


            <Editor/>


          </AutoFormElement>


          <AutoFormElement>




 igds-core/src/main/java/models/igds.model.xml


@@ -154,9 +154,9 @@


        <Property name="valueProperty">name</Property>


      </Property>


    </PropertyDef>


    <PropertyDef name="gbm">


    <PropertyDef name="ggm">


      <Property/>


      <Property name="label">廒间国别码</Property>


      <Property name="label">国规码</Property>


    </PropertyDef>


  </DataType>


  <DataType name="dtDepot">




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


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,216 @@


<!DOCTYPE html>


<html lang='zh-cn'>


<head>


    <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>


    <title>入库检斤质检结算单</title>


    <style>body {


        text-align: center;


        padding: 10px


    }




    .tit {


        margin: 10px;


        font-size: 24px;


        font-family: '宋体';


        padding-top: 15px


    }




    .div-tit {


        text-align: right;


        padding-top: 10px;


        padding-right: 20px;


    }




    table {


        width: 100%;


        border-right: 1px solid;


        border-bottom: 1px solid;


        font-size: 14px


    }




    table td {


        border-left: 1px solid;


        border-top: 1px solid;


        height: 38px


    }


    </style>


</head>


<body><h1 class='tit'>入库检斤质检结算单</h1>


<div class='div-tit'>编码：serId</div>


<table cellspacing='0' cellpadding='0'>


    <tr>


        <td `width`="22%" colspan="2">单位名称</td>


        <td width='23%' colspan='3'>customerName</td>


        <td width='11%'>库区名称</td>


        <td colspan='4' `width`='44%'>deptName</td>


    </tr>


    <tr>


        <td width='11%'>入仓</td>


        <td width='11%'>仓房名称</td>


        <td width='12%'>depotName</td>


        <td width='11%'>货位名称</td>


        <td width='11%'>hwmc</td>


        <td width='11%'>保管员</td>


        <td width='33%' colspan="4">storeKeeperName</td>


    </tr>


    <tr>


        <td rowspan="4">客户及结算</td>


        <td>客户名称（单位名称）</td>


        <td>customerName</td>


        <td>身份证（社会信用代码）</td>


        <td>userId</td>


        <td colspan="4"></td>


    </tr>


    <tr>


        <td>联系电话</td>


        <td>phone</td>


        <td>地址</td>


        <td colspan="5">address</td>


    </tr>


    <tr>


        <td>合同号</td>


        <td>contractId</td>


        <td>银行账号</td>


        <td>bankNum</td>


        <td>开户行</td>


        <td colspan="3">customerBank</td>


    </tr>


    <tr>


        <td>结算单价</td>


        <td>DPrice</td>


        <td>结算总价</td>


        <td>ZPrice</td>


        <td colspan="4"></td>


    </tr>


    <tr>


        <td rowspan="2">承运</td>


        <td>承运人</td>


        <td>driverName</td>


        <td>身份证号</td>


        <td>driverId</td>


        <td>联系电话</td>


        <td colspan="3"></td>


    </tr>


    <tr>


        <td>运输工具</td>


        <td>transType</td>


        <td>车船号</td>


        <td>plateNum</td>


        <td colspan="4"></td>


    </tr>


    <tr>


        <td rowspan="2">登记</td>


        <td>入门时间</td>


        <td>inTime</td>


        <td>登记员</td>


        <td>inRegistrar</td>


        <td colspan="4"></td>


    </tr>


    <tr>


        <td>出门时间</td>


        <td>outTime</td>


        <td>登记员</td>


        <td>outRegistrar</td>


        <td colspan="4"></td>


    </tr>


    <tr>


        <td rowspan="4">检斤</td>


        <td>毛重（吨）</td>


        <td>fullWeight</td>


        <td>毛重检斤时间</td>


        <td>fullWeightTime</td>


        <td>检斤员</td>


        <td>JJYFullWeight</td>


        <td>监磅员</td>


        <td>JBYFullWeight</td>


    </tr>


    <tr>


        <td>皮重（吨）</td>


        <td>emptyWeight</td>


        <td>皮重检斤时间</td>


        <td>emptyWeightTime</td>


        <td>检斤员</td>


        <td>JJYEmptyWeight</td>


        <td>监磅员</td>


        <td>JBYEmptyWeight</td>


    </tr>


    <tr>


        <td>净重（吨）</td>


        <td>netWeight</td>


        <td>水杂扣（增）重</td>


        <td>deOrAddCheck KG</td>


        <td>其他扣重</td>


        <td colspan="3">deOther KG</td>


    </tr>


    <tr>


        <td>计价数量（吨）</td>


        <td>storageSettle</td>


        <td>其他扣重说明</td>


        <td colspan="5">deOtherInfo</td>


    </tr>


    <tr>


        <td rowspan="5">检验</td>


        <td>品种</td>


        <td>foodVariety</td>


        <td>等级</td>


        <td>foodLevel</td>


        <td>容重（g/L）</td>


        <td colspan="3">bulkWeight</td>


    </tr>


    <tr>


        <td>杂质（%）</td>


        <td>C02</td>


        <td>水分（%）</td>


        <td>C01</td>


        <td>色泽、气味</td>


        <td colspan="3">C06</td>


    </tr>


    <tr>


        <td>不完善粒（%）</td>


        <td>C04</td>


        <td>生芽粒（%）</td>


        <td>C35</td>


        <td>生霉粒（%）</td>


        <td colspan="3">C29</td>


    </tr>




    <tr>


        <td>面筋吸水量（%）</td>


        <td>C08</td>


        <td>品尝分值</td>


        <td>C07</td>


        <td>色泽、气味</td>


        <td colspan="3">C06</td>


    </tr>


    <tr>


        <td>呕吐毒（mg/kg）</td>


        <td>C27</td>


        <td>玉米赤霉烯酮（μg/kg）</td>


        <td>C31</td>


        <td>铅（mg/kg）</td>


        <td colspan="3">C32</td>


    </tr>


    <tr>


        <td rowspan="2">检验</td>


        <td>镉（mg/kg）</td>


        <td>C25</td>


        <td>汞（μg/kg）</td>


        <td>C33</td>


        <td>无机砷（mg/kg）</td>


        <td colspan="3">C30</td>


    </tr>


    <tr>


        <td>扦样员</td>


        <td>sampleUser</td>


        <td>检验员</td>


        <td>checkUser</td>


        <td>检验时间</td>


        <td colspan="3">checkTime</td>


    </tr>


    <tr>


        <td>备注</td>


        <td colspan="8">remark</td>


    </tr>


</table>


</body>


</html>




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


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,148 @@


<!DOCTYPE html>


<html lang='zh-cn'>


<head>


    <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>


    <title>出库检斤质检结算单</title>


    <style>body {


        text-align: center;


        padding: 10px


    }




    .tit {


        margin: 10px;


        font-size: 24px;


        font-family: '宋体';


        padding-top: 15px


    }




    .div-tit {


        text-align: right;


        padding-top: 10px;


        padding-right: 20px;


    }




    table {


        width: 100%;


        border-right: 1px solid;


        border-bottom: 1px solid;


        font-size: 14px


    }




    table td {


        border-left: 1px solid;


        border-top: 1px solid;


        height: 38px


    }


    </style>


</head>


<body><h1 class='tit'>出库检斤质检结算单</h1>


<div class='div-tit'>编码：serId</div>


<table cellspacing='0' cellpadding='0'>


    <tr>


        <td `width`="22%" colspan="2">单位名称</td>


        <td width='23%' colspan='3'>customerName</td>


        <td width='11%'>库区名称</td>


        <td colspan='4' `width`='44%'>deptName</td>


    </tr>


    <tr>


        <td width='11%'>出仓</td>


        <td width='11%'>仓房名称</td>


        <td width='12%'>depotName</td>


        <td width='11%'>货位名称</td>


        <td width='11%'>hwmc</td>


        <td width='11%'>保管员</td>


        <td width='33%' colspan="4">storeKeeperName</td>


    </tr>


    <tr>


        <td rowspan="2">客户</td>


        <td>客户名称（单位名称）</td>


        <td>customerName</td>


        <td>身份证（社会信用代码）</td>


        <td>userId</td>


        <td colspan="4"></td>


    </tr>


    <tr>


        <td>联系电话</td>


        <td>phone</td>


        <td>地址</td>


        <td colspan="5">address</td>


    </tr>


    <tr>


        <td rowspan="2">承运</td>


        <td>承运人</td>


        <td>driverName</td>


        <td>身份证号</td>


        <td>driverId</td>


        <td>联系电话</td>


        <td colspan="3"></td>


    </tr>


    <tr>


        <td>运输工具</td>


        <td>transType</td>


        <td>车船号</td>


        <td>plateNum</td>


        <td colspan="4"></td>


    </tr>




    <tr>


        <td>计划通知</td>


        <td>出库计划文号/合同号</td>


        <td>referenceNumber</td>


        <td>出库通知单号</td>


        <td colspan="5">noticeId</td>


    </tr>


    <tr>


        <td rowspan="2">登记</td>


        <td>入门时间</td>


        <td>inTime</td>


        <td>登记员</td>


        <td>inRegistrar</td>


        <td colspan="4"></td>


    </tr>


    <tr>


        <td>出门时间</td>


        <td>outTime</td>


        <td>登记员</td>


        <td>outRegistrar</td>


        <td colspan="4"></td>


    </tr>


    <tr>


        <td rowspan="4">检斤</td>


        <td>毛重（吨）</td>


        <td>fullWeight</td>


        <td>毛重检斤时间</td>


        <td>fullWeightTime</td>


        <td>检斤员</td>


        <td>JJYFullWeight</td>


        <td>监磅员</td>


        <td>JBYFullWeight</td>


    </tr>


    <tr>


        <td>皮重（吨）</td>


        <td>emptyWeight</td>


        <td>皮重检斤时间</td>


        <td>emptyWeightTime</td>


        <td>检斤员</td>


        <td>JJYEmptyWeight</td>


        <td>监磅员</td>


        <td>JBYEmptyWeight</td>


    </tr>


    <tr>


        <td>净重（吨）</td>


        <td>netWeight</td>


        <td>扣（增）重（公斤）</td>


        <td>deOrAddCheck</td>


        <td>计价数量（吨）</td>


        <td colspan="3">storageSettle</td>


    </tr>


    <tr>


        <td>检验</td>


        <td colspan="8">出库检测报告</td>


    </tr>


    <tr>


        <td>备注</td>


        <td colspan="8">remark</td>


    </tr>


</table>


</body>


</html>




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


¶Ô±ÈÐÂÎļþ


@@ -0,0 +1,126 @@


<!DOCTYPE html>


<html lang='zh-cn'>


<head>


    <meta http-equiv='Content-Type' content='text/html;charset=UTF-8'>


    <title>货位卡</title>


    <style>body {


        text-align: center;


        padding: 10px


    }




    .tit {


        margin: 10px;


        font-size: 24px;


        font-family: '宋体';


        padding-top: 15px


    }




    .div-tit {


        text-align: left;


        padding-left: 10px;


        padding-bottom: 5px;


    }




    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'>货位卡</h1>


<div class="div-tit">保管单位： customerKeeper</div>


<div class="div-tit">统计报账单位： accountKeeper</div>


<table cellspacing='0' cellpadding='0'>


    <tr>


        <td width='14%' rowspan="2">仓房货位</td>


        <td width='14%'>仓房名称</td>


        <td width='14%'>depotName</td>


        <td width='14%'>货位名称</td>


        <td width='15%'>hwmc</td>


        <td width='14%'>保管员</td>


        <td width='15%'>storeKeeperName</td>


    </tr>


    <tr>


        <td>仓型</td>


        <td>depotType</td>


        <td>设计仓容（吨）</td>


        <td>storageMax</td>


        <td>状态</td>


        <td>depotStatus</td>


    </tr>


    <tr>


        <td rowspan="6">库存信息</td>


        <td>存储类型</td>


        <td>storeType</td>


        <td>储粮性质</td>


        <td>foodType</td>


        <td>收储地点</td>


        <td>storeLocation</td>


    </tr>


    <tr>


        <td>保管方式</td>


        <td>KeepType</td>


        <td>实际数量（吨）</td>


        <td>storageReal</td>


        <td>计价数量（吨）</td>


        <td>storageSettle</td>


    </tr>


    <tr>


        <td>散存粮体积</td>


        <td>bulkVolume</td>


        <td>长/宽/高（米）</td>


        <td>CKG</td>


        <td>包存粮包数</td>


        <td>packages</td>


    </tr>


    <tr>


        <td>产地</td>


        <td>foodLocation</td>


        <td>收获年度</td>


        <td>foodYear</td>


        <td>入仓年度</td>


        <td>inYear</td>


    </tr>


    <tr>


        <td>品种</td>


        <td>foodVariety</td>


        <td>等级</td>


        <td>FoodLevel</td>


        <td>容重（g/L）</td>


        <td>bulkWeight</td>


    </tr>


    <tr>


        <td>杂质（%）</td>


        <td>C02</td>


        <td>折合水分（%）</td>


        <td>C01</td>


        <td>色泽、气味</td>


        <td>C06</td>


    </tr>


    <tr>


        <td rowspan="sampleNumber">检测记录</td>


        <td colspan="2">扦样时间</td>


        <td colspan="2">检测类型</td>


        <td colspan="2">检测机构</td>


    </tr>


    <!--需要循环 sampleNumber - 1次-->


    <tr>


        <td colspan="2"></td>


        <td colspan="2"></td>


        <td colspan="2"></td>


    </tr>


    <tr>


        <td>备注</td>


        <td colspan="6">remark</td>


    </tr>


</table>


</body>


</html>