From 0b8a64a914268c02d2cda9517ab54131b64c8138 Mon Sep 17 00:00:00 2001 From: erzhongxmu Date: Sun, 12 Jul 2020 10:30:22 +0800 Subject: [PATCH] RFID API --- pom.xml | 17 +- .../service/impl/WmOmNoticeHServiceImpl.java | 1 + src/main/resources/dbconfig.properties | 2 +- src/main/resources/redis.properties | 20 +++ src/main/resources/redis.xml | 62 ++++++++ src/main/resources/spring-mvc.xml | 7 +- src/main/resources/sysConfig.properties | 16 +- .../webpage/com/zzjee/wm/wmImNoticeH-add.jsp | 147 +++++++++--------- .../webpage/com/zzjee/wm/wmOmNoticeH-add.jsp | 135 ++++++++-------- 9 files changed, 251 insertions(+), 156 deletions(-) create mode 100644 src/main/resources/redis.properties create mode 100644 src/main/resources/redis.xml diff --git a/pom.xml b/pom.xml index 228c94a0..8b9c0311 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,9 @@ 1.6.5 1.1.1 - + + 1.6.2.RELEASE + 2.9.0 1.8.4 @@ -982,7 +984,18 @@ 2.8.8.1 - + + + org.springframework.data + spring-data-redis + ${spring-data-redis.version} + + + redis.clients + jedis + ${jedis.version} + + diff --git a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java index 3f029a59..e3f4ebbe 100644 --- a/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java +++ b/src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java @@ -111,6 +111,7 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot tmsYwDingdanEntity.setYwddbz(wmOmNoticeH.getOmBeizhu()); tmsYwDingdanEntity.setYwkhdh(wmOmNoticeH.getOmNoticeId()); tmsYwDingdanEntity.setZhuangtai("已下单"); + tmsYwDingdanEntity.setFadh(wmOmNoticeH.getOmNoticeId()); this.save(tmsYwDingdanEntity); }catch (Exception e){ diff --git a/src/main/resources/dbconfig.properties b/src/main/resources/dbconfig.properties index c226c0ef..d9fd60a3 100644 --- a/src/main/resources/dbconfig.properties +++ b/src/main/resources/dbconfig.properties @@ -17,7 +17,7 @@ #MySQL hibernate.dialect=org.hibernate.dialect.MySQLDialect validationQuery.sqlserver=SELECT 1 -jdbc.url.jeecg=jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=UTF-8 +jdbc.url.jeecg=jdbc:mysql://127.0.0.1:3306/wms?useUnicode=true&characterEncoding=UTF-8 jdbc.username.jeecg=root jdbc.password.jeecg=Zzerp123 diff --git a/src/main/resources/redis.properties b/src/main/resources/redis.properties new file mode 100644 index 00000000..5b21738d --- /dev/null +++ b/src/main/resources/redis.properties @@ -0,0 +1,20 @@ +#IP +redis.host=127.0.0.1 +#\u7AEF\u53E3 +redis.port=6379 +#\u5BC6\u7801 +redis.password= +#\u8D85\u65F6\uFF0C\u5355\u4F4D\u6BEB\u79D2 +redis.timeout=10000 +#\u6700\u5927\u7A7A\u95F2\u6570 +redis.maxIdle=300 +#\u6700\u5927\u8FDE\u63A5\u6570 +redis.maxTotal=600 +#\u6700\u5927\u7A7A\u95F2\u6570 +redis.minIdle=1 +#\u6700\u5927\u5EFA\u7ACB\u8FDE\u63A5\u7B49\u5F85\u65F6\u95F4 +redis.maxWait=1000 +#\u6307\u660E\u662F\u5426\u5728\u4ECE\u6C60\u4E2D\u53D6\u51FA\u8FDE\u63A5\u524D\u8FDB\u884C\u68C0\u9A8C,\u5982\u679C\u68C0\u9A8C\u5931\u8D25,\u5219\u4ECE\u6C60\u4E2D\u53BB\u9664\u8FDE\u63A5\u5E76\u5C1D\u8BD5\u53D6\u51FA\u53E6\u4E00\u4E2A +redis.testOnBorrow=false +#\u4F7F\u7528redis\u5757\u5206\u533A,0-15 +redis.database=0 \ No newline at end of file diff --git a/src/main/resources/redis.xml b/src/main/resources/redis.xml new file mode 100644 index 00000000..2a728b9f --- /dev/null +++ b/src/main/resources/redis.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml index 3db87fe8..e3815f79 100644 --- a/src/main/resources/spring-mvc.xml +++ b/src/main/resources/spring-mvc.xml @@ -7,8 +7,8 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://www.springframework.org/schema/mvc - http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd - http://cxf.apache.org/jaxws + http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd + http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"> @@ -160,5 +160,6 @@ + - \ No newline at end of file + diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties index ae2e9e22..26b20ddd 100644 --- a/src/main/resources/sysConfig.properties +++ b/src/main/resources/sysConfig.properties @@ -16,7 +16,7 @@ office_home=D://OpenOffice #DEV(\u5F00\u53D1\u6A21\u5F0F)/PUB(\u751F\u4EA7\u6A21\u5F0F) sqlReadMode=PUB -#database type for spring jdbc +#database type for spring jdbc jdbc.url.jeecg=mysql #\u6309\u94AE\u6743\u9650\u5F00\u5173 @@ -142,12 +142,12 @@ systuopan=yes #\u5BF9\u8D26\u5355\u663E\u793A\u660E\u7EC6 sysdzd=yes #\u4ED3\u5E93\u4FE1\u606F -comname=\u53A6\u95E8\u5E02\u7075\u9E7F\u8C37\u79D1\u6280\u6709\u9650\u516C\u53F8 -comaddr=\u53A6\u95E8\u5E02\u7075\u9E7F\u8C37\u79D1\u6280\u6709\u9650\u516C\u53F8 +comname=\u65B0\u7586\u534E\u5B9C\u4E07\u901A\u7F51\u7EDC\u79D1\u6280\u6709\u9650\u516C\u53F8 +comaddr=\u65B0\u7586\u4E4C\u9C81\u6728\u9F50\u9AD8\u65B0\u6280\u672F\u4EA7\u4E1A\u5F00\u53D1\u533A\u5929\u6D25\u5357\u8DEF682\u53F7\u521B\u4E1A\u670D\u52A1\u4E2D\u5FC3\u7559\u521B\u56ED215-21 comtel= #\u5BF9\u8D26\u4FE1\u606F -comfiname=\u53A6\u95E8\u5E02\u7075\u9E7F\u8C37\u79D1\u6280\u6709\u9650\u516C\u53F8 -comfiaddr=\u53A6\u95E8\u5E02\u7075\u9E7F\u8C37\u79D1\u6280\u6709\u9650\u516C\u53F8 +comfiname=\u65B0\u7586\u534E\u5B9C\u4E07\u901A\u7F51\u7EDC\u79D1\u6280\u6709\u9650\u516C\u53F8 +comfiaddr=\u65B0\u7586\u4E4C\u9C81\u6728\u9F50\u9AD8\u65B0\u6280\u672F\u4EA7\u4E1A\u5F00\u53D1\u533A\u5929\u6D25\u5357\u8DEF682\u53F7\u521B\u4E1A\u670D\u52A1\u4E2D\u5FC3\u7559\u521B\u56ED215-21 comfitel= comfibankid= comfibankname= @@ -179,7 +179,7 @@ scrq=2099-12-31 #\u662F\u5426\u542F\u7528\u5546\u54C1\u6761\u7801 -sptmon=no +sptmon=yes #beijingend yydbkey=mssql @@ -189,7 +189,7 @@ yy.cuscode=hwm interfacetype=DSC #\u96C6\u56E2\u7248\u672C on -comgroup=on +comgroup=off #\u62E3\u8D27\u5355\u5355\u4F4D tijiunit=\u7ACB\u65B9\u5206\u7C73 @@ -208,7 +208,7 @@ wm.rkd=hr show.noticeurl=http://120.78.150.43/wmstest/wmOmNoticeHController.do?showlist&id= show.goodsurl=http://120.78.150.43/wmstest/wmOmNoticeHController.do?showgoods&id= -wms.totms=no +wms.totms=yes sys.del=database diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmImNoticeH-add.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmImNoticeH-add.jsp index d48fbd46..f62d3d13 100644 --- a/src/main/webapp/webpage/com/zzjee/wm/wmImNoticeH-add.jsp +++ b/src/main/webapp/webpage/com/zzjee/wm/wmImNoticeH-add.jsp @@ -12,10 +12,10 @@ - + - + @@ -33,14 +33,14 @@ - +
- + - +
    @@ -171,45 +171,44 @@
    - +
    客户编码：
    + defaultVal="${wmImNoticeHPage.cusCode}" dictTable="mv_cus" dictField="cus_code" dictText="cus_name" hasLabel="false" title="客户编码"> <%-- --%>
    - - - - + + + +
    预计到货时间：
    -
    - 客户订单号： + 客户订单号*：
    - - -
    - - + ignore="ignore" validType="wm_im_notice_h,im_cus_code,id" + /> + 不能重复 +
    + +
    运输号码：
    @@ -221,8 +220,8 @@
    - - + +
    运输公司： @@ -260,13 +259,13 @@ 订单类型：
    - +
    - - + + <%--
    --%> <%--月台：--%> <%--
    --%> @@ -277,8 +276,8 @@ <%----%> <%--
    --%>
- - + +
备注： @@ -296,7 +295,7 @@
- +
@@ -304,19 +303,19 @@
- +
- - - + + + @@ -339,12 +338,12 @@ - + - + - +
@@ -443,26 +442,26 @@ <%----%> <%-- <%-- icon="icon-search" title="common.role.list" textname="wmImNoticeIList[#index#].goodsCode" isclear="true" isInit="true"> --%> - - + + - + - + <%-- <%-- dictTable="ba_unit" dictField="unit_code" dictText="unit_zh_name" hasLabel="false" title="单位"> --%> - - + + - + @@ -471,14 +470,14 @@
- - +
- + - \ No newline at end of file + diff --git a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-add.jsp b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-add.jsp index 147e5202..40789664 100644 --- a/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-add.jsp +++ b/src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeH-add.jsp @@ -12,7 +12,7 @@ - + @@ -41,19 +41,19 @@
- + - - + +
    @@ -148,12 +148,12 @@
+ defaultVal="${wmOmNoticeHPage.cusCode}" readonly="${wmOmNoticeHPage.readonly}" dictTable="mv_cus" dictField="cus_code" dictText="cus_name" hasLabel="false" title="客户编码">
- - + +
要求交货时间：
@@ -164,26 +164,25 @@ - +
订单类型：
- +
- 客户订单号： + 客户订单号*：
- - -
+ 不能重复 +
@@ -232,8 +231,8 @@
- - + +
收货人电话：
@@ -244,8 +243,8 @@ - - + +
收货人地址： @@ -256,8 +255,8 @@
- - + +
运输人：
@@ -273,7 +272,7 @@
- + <%--
--%> <%--承运人电话：--%> <%--
--%> @@ -283,8 +282,8 @@ <%----%> <%----%> <%----%> - - + +
发货运单号或车号：
@@ -292,14 +291,14 @@ - +<%-- +<%-- />--%> - - + +
<%--
--%> <%--发货月台：--%> @@ -310,7 +309,7 @@ <%----%> <%----%> <%--
--%> - +
备注
@@ -321,35 +320,35 @@
- +
附件
- +
- + - + - +
- - - + + + @@ -372,12 +371,12 @@ - + - + - +
@@ -462,9 +461,9 @@ - + <%--
<%-- <%-- dictCondition="${wmOmNoticeHPage.wherecon}" dictTable="mv_goods" dictField="goods_code" dictText="goods_name" defaultVal="" hasLabel="false" title="商品编码"> --%> - - - @@ -473,15 +472,15 @@ - - + --%> @@ -507,6 +506,6 @@
- + - \ No newline at end of file +