Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC006.java

@@ -15,6 +15,7 @@ import java.sql.Timestamp;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,7 +30,7 @@ public class HPKC006 extends DaoEPBase {
     private Integer id = 0;
     private String companyCode = " ";        /* 企业编码 预留*/
     private String depCode = " ";        /* 部门编码 预留*/
-    private Timestamp receiptTime;        /* 单据日期*/
+    private Date receiptTime;        /* 单据日期*/
     private String otherEnthouse = " ";        /* 其他入库单号*/
     private String whCode = " ";        /* 仓库编码*/
     private String whName = " ";        /* 仓库名称*/
@@ -174,14 +175,14 @@ public class HPKC006 extends DaoEPBase {
      * get the receiptTime - 单据日期
      * @return the receiptTime
      */
-    public Timestamp getReceiptTime() {
+    public Date getReceiptTime() {
         return this.receiptTime;
     }
 
     /**
      * set the receiptTime - 单据日期
      */
-    public void setReceiptTime(Timestamp receiptTime) {
+    public void setReceiptTime(Date receiptTime) {
         this.receiptTime = receiptTime;
     }
 
@@ -358,7 +359,7 @@ public class HPKC006 extends DaoEPBase {
         setId(NumberUtils.toInteger(StringUtils.toString(map.get("id")), id));
         setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("companyCode")), companyCode));
         setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("depCode")), depCode));
-        setReceiptTime(DateUtils.toTimestamp(StringUtils.toString(map.get("receiptTime"))));
+        setReceiptTime(DateUtils.toDate(StringUtils.toString(map.get("receiptTime"))));
         setOtherEnthouse(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("otherEnthouse")), otherEnthouse));
         setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("whCode")), whCode));
         setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("whName")), whName));
@@ -381,7 +382,7 @@ public class HPKC006 extends DaoEPBase {
         map.put("id", StringUtils.toString(id, eiMetadata.getMeta("id")));
         map.put("companyCode", StringUtils.toString(companyCode, eiMetadata.getMeta("companyCode")));
         map.put("depCode", StringUtils.toString(depCode, eiMetadata.getMeta("depCode")));
-        map.put("receiptTime", StringUtils.toString(receiptTime, eiMetadata.getMeta("receiptTime")));
+        map.put("receiptTime",StringUtils.toString(receiptTime, eiMetadata.getMeta("receiptTime")));
         map.put("otherEnthouse", StringUtils.toString(otherEnthouse, eiMetadata.getMeta("otherEnthouse")));
         map.put("whCode", StringUtils.toString(whCode, eiMetadata.getMeta("whCode")));
 

src/main/java/com/baosight/hpjx/hp/kc/domain/HPKC007.java

@@ -9,6 +9,8 @@ import com.baosight.iplat4j.core.util.DateUtils;
 import java.sql.Timestamp;
 import com.baosight.iplat4j.core.ei.EiColumn;
 import com.baosight.iplat4j.core.data.DaoEPBase;
+
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import com.baosight.iplat4j.core.util.StringUtils;
@@ -22,7 +24,7 @@ public class HPKC007 extends DaoEPBase {
                 private Integer id = 0;		
                 private String companyCode = " ";		/* 企业编码 预留*/
                 private String depCode = " ";		/* 部门编码 预留*/
-                 private Timestamp receiptTime ;		/* 单据日期*/
+                 private Date receiptTime ;		/* 单据日期*/
                 private String otherEnthouse = " ";		/* 其他入库单号*/
                 private String whCode = " ";		/* 仓库编码*/
                 private String whName = " ";		/* 仓库名称*/
@@ -157,14 +159,14 @@ initMetaData();
         * get the receiptTime - 单据日期
         * @return the receiptTime
         */
-        public Timestamp getReceiptTime() {
+        public Date getReceiptTime() {
         return this.receiptTime;
         }
 
         /**
         * set the receiptTime - 单据日期
         */
-        public void setReceiptTime(Timestamp receiptTime) {
+        public void setReceiptTime(Date receiptTime) {
         this.receiptTime = receiptTime;
         }
         /**
@@ -315,7 +317,9 @@ public void fromMap(Map map) {
                 setId(NumberUtils.toInteger(StringUtils.toString(map.get("id")), id));
                 setCompanyCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("companyCode")), companyCode));
                 setDepCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("depCode")), depCode));
-                setReceiptTime(DateUtils.toTimestamp(StringUtils.toString(map.get("receiptTime"))));
+
+                setReceiptTime(DateUtils.toDate(StringUtils.toString(map.get("receiptTime"))));
+
                 setOtherEnthouse(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("otherEnthouse")), otherEnthouse));
                 setWhCode(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("whCode")), whCode));
                 setWhName(StringUtils.defaultIfEmpty(StringUtils.toString(map.get("whName")), whName));

src/main/java/com/baosight/hpjx/hp/kc/service/ServiceHPKC006.java

@@ -6,9 +6,12 @@ import com.baosight.iplat4j.core.ei.EiInfo;
 import com.baosight.iplat4j.core.exception.PlatException;
 import com.baosight.iplat4j.core.service.impl.ServiceBase;
 import com.baosight.hpjx.hp.kc.domain.HPKC006;
+import com.baosight.iplat4j.core.web.threadlocal.UserSession;
 
 
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 public class ServiceHPKC006 extends ServiceBase {
@@ -28,6 +31,7 @@ public class ServiceHPKC006 extends ServiceBase {
     public EiInfo query(EiInfo inInfo) {
         /* 调用EI查询方法.*/
         EiInfo outInfo = super.query(inInfo, "HPKC006.query", new HPKC006());
+        System.out.println(outInfo);
         return outInfo;
 
     }
@@ -37,7 +41,7 @@ public class ServiceHPKC006 extends ServiceBase {
      */
     @Override
     public EiInfo insert(EiInfo inInfo) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
             HPKC006 hpkc006 = new HPKC006();
 //            System.out.println(inInfo.getBlock("result"));
@@ -48,6 +52,8 @@ public class ServiceHPKC006 extends ServiceBase {
                 Map<?, ?> map = eiBlock.getRow(i);
 //                System.out.println(map);
                 hpkc006.fromMap(map);
+                System.out.println(UserSession.getSessionJson());
+                System.out.println(Timestamp.valueOf(sdf.format(new Date())));
 
                 this.dao.insert("HPKC006.insert", hpkc006.toMap());
             }

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC006.xml

@@ -42,7 +42,8 @@
 				REMARK	as "remark" <!-- 备注 -->
 		FROM hpjx.t_hpkc006 WHERE 1=1
 		<isNotEmpty prepend=" AND " property="receiptTime">
-			RECEIPT_TIME LIKE CONCAT('%' ,CONCAT( #receiptTime#,'%'))
+
+			RECEIPT_TIME STR_TO_DATE(#receiptTime#, 'yyyy-MM-dd')
 		</isNotEmpty>
 
 		<isNotEmpty prepend=" AND " property="otherEnthouse">

src/main/java/com/baosight/hpjx/hp/pz/service/ServiceHPPZ007.java

@@ -79,6 +79,7 @@ public class ServiceHPPZ007 extends ServiceBase {
                 hppz007.fromMap(map);
                 hppz007.setUpdatedBy(UserSession.getLoginName());
                 hppz007.setUpdatedTime(Timestamp.valueOf(sdf.format(new Date())));
+                System.out.println(Timestamp.valueOf(sdf.format(new Date())));
                 this.dao.update("HPPZ007.update", hppz007.toMap());
             }
             inInfo.setStatus(EiConstant.STATUS_SUCCESS);

src/main/webapp/HP/KC/HPKC006.js

@@ -9,7 +9,7 @@ $(function () {
     IPLATUI.EFGrid.result = {
         pageable: {
             pageSize: 20,
-            pageSizes: [10, 20, 50, 70, 100],
+            pageSizes: [10, 20, 30, 50, 100, 200],
         },
     }
 });
\ No newline at end of file

src/main/webapp/HP/KC/HPKC006.jsp

@@ -7,18 +7,26 @@
 <head>
     <%--    <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
 </head>
-<EF:EFPage title="仓库档案">
-
-    <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
-
+<EF:EFPage title="其他入库单">
+
+    <EF:EFRegion id="inqu" title="查询条件" align-item="center"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
+        <style>
+            .row {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+            }
+        </style>
         <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
-            <EF:EFInput blockId="inqu_status" ename="receiptTime" cname="单据日期" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="otherEnthouse" cname="其他出库单号" row="0"/>
+            <EF:EFDatePicker blockId="inqu_status" ename = "receiptTime" cname="单据日期"
+                             format="yyyy-MM-dd"  />
+
+            <EF:EFInput blockId="inqu_status" ename="otherEnthouse" cname="其他入库单号" row="0"/>
             <EF:EFInput blockId="inqu_status" ename="whName" cname="仓库名称" row="0"/>
 
             <EF:EFSelect cname="单据状态" optionLabel="全部" blockId="inqu_status" ename="status" row="0">
-                <EF:EFOption label="启用" value="1"/>
-                <EF:EFOption label="停用" value="0"/>
+                <EF:EFOption label="审核" value="1"/>
+                <EF:EFOption label="反审" value="0"/>
             </EF:EFSelect>
         </div>
 
@@ -38,9 +46,9 @@
             <EF:EFColumn ename="spec" cname="规格"/>
             <EF:EFColumn ename="amount" cname="数量"/>
             <EF:EFColumn ename="weight" cname="重量"/>
-            <EF:EFComboColumn align="center" ename="status" cname="状态">
-                <EF:EFOption label="启用" value="1"/>
-                <EF:EFOption label="停用" value="0"/>
+            <EF:EFComboColumn align="center" ename="status" cname="操作">
+                <EF:EFOption label="审核" value="1"/>
+                <EF:EFOption label="反审" value="0"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="remark" cname="备注"/>
 

src/main/webapp/HP/KC/HPKC007.js

@@ -9,7 +9,7 @@ $(function () {
     IPLATUI.EFGrid.result = {
         pageable: {
             pageSize: 20,
-            pageSizes: [10, 20, 50, 70, 100],
+            pageSizes: [10, 20, 30, 50, 100, 200],
         },
     }
 });
\ No newline at end of file

src/main/webapp/HP/KC/HPKC007.jsp

@@ -10,15 +10,22 @@
 <EF:EFPage title="仓库档案">
 
     <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
-
+        <style>
+            .row {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+            }
+        </style>
         <div class="row"> <%--    blockId="inqu_status" row="0"   --%>
-            <EF:EFInput blockId="inqu_status" ename="receiptTime" cname="单据日期" row="0"/>
+            <EF:EFDatePicker ename="receiptDate" cname="单据日期"
+                             format="yyyy-MM-dd"  depth="year" />
             <EF:EFInput blockId="inqu_status" ename="otherEnthouse" cname="其他出库单号" row="0"/>
             <EF:EFInput blockId="inqu_status" ename="whName" cname="仓库名称" row="0"/>
 
             <EF:EFSelect cname="单据状态" optionLabel="全部" blockId="inqu_status" ename="status" row="0">
-                <EF:EFOption label="启用" value="1"/>
-                <EF:EFOption label="停用" value="0"/>
+                <EF:EFOption label="审核" value="1"/>
+                <EF:EFOption label="反审" value="0"/>
             </EF:EFSelect>
         </div>
 
@@ -37,9 +44,9 @@
             <EF:EFColumn ename="matName" cname="物料名称"/>
             <EF:EFColumn ename="amount" cname="数量"/>
             <EF:EFColumn ename="weight" cname="重量"/>
-            <EF:EFComboColumn align="center" ename="status" cname="单据状态">
-                <EF:EFOption label="启用" value="1"/>
-                <EF:EFOption label="停用" value="0"/>
+            <EF:EFComboColumn align="center" ename="status" cname="操作">
+                <EF:EFOption label="审核" value="1"/>
+                <EF:EFOption label="反审" value="0"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="remark" cname="备注"/>
 

src/main/webapp/HP/PZ/HPPZ007.js

@@ -9,7 +9,7 @@ $(function () {
     IPLATUI.EFGrid.result = {
         pageable: {
             pageSize: 20,
-            pageSizes: [10, 20, 50, 70, 100],
+            pageSizes: [10, 20, 30, 50, 100, 200],
         },
     }
 });
\ No newline at end of file