From a33dc40a236b697921b1d8a46284b5008bf04216 Mon Sep 17 00:00:00 2001 From: e Date: Tue, 7 Jan 2020 08:27:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=BA=93=E5=AD=98=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=80=BB=E8=BE=91=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/system/sms/util/task/SmsSendTask.java | 23 ++ src/main/resources/dbconfig.properties | 7 - src/main/resources/hwmsysConfig.properties | 316 ++++++++++++++++++ .../resources/jeecg/jeecg_database.properties | 4 - src/main/resources/sysConfig.properties | 1 + 5 files changed, 340 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/hwmsysConfig.properties diff --git a/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java b/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java index 7522810a..0762fe25 100644 --- a/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java +++ b/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java @@ -435,6 +435,20 @@ public class SmsSendTask { + " from wv_stock ws, md_bin mb where " + " ws.ku_wei_bian_ma = mb.ku_wei_bian_ma and mb.ku_wei_lei_xing = '良品区' and mb.ting_yong <> 'Y' and (ws.kuctype = '库存' or ws.kuctype = '待下架')" ; + String aldown = "no"; + try { + aldown = ResourceUtil.getConfigByName("wm.alldown"); + }catch (Exception e){ + + } + + if("yes".equals(aldown)){ + tsql = "select ws.base_unit,ws.zhong_wen_qch, ws.ku_wei_bian_ma,ws.bin_id,ws.shp_ming_cheng,cast(sum(ws.base_goodscount) as signed) as goods_qua, mb.qu_huo_ci_xu, ws.goods_pro_data" + + " from wv_stock ws, md_bin mb where " + + " ws.ku_wei_bian_ma = mb.ku_wei_bian_ma and mb.ting_yong <> 'Y' and (ws.kuctype = '库存' or ws.kuctype = '待下架')" + ; + } + if(StringUtil.isNotEmpty(tuopanma)) { tsql = tsql + " and ws.bin_id like '%"+tuopanma + "%' "; } @@ -476,6 +490,15 @@ public class SmsSendTask { String tsqlz = "select ws.base_unit,ws.zhong_wen_qch, ws.ku_wei_bian_ma,ws.bin_id,ws.shp_ming_cheng,cast(sum(ws.base_goodscount) as signed) as goods_qua, mb.qu_huo_ci_xu, ws.goods_pro_data" + " from wv_stock ws, md_bin mb where " + " ws.ku_wei_bian_ma = mb.ku_wei_bian_ma and mb.ku_wei_lei_xing = '良品区' and mb.ting_yong <> 'Y' and (ws.kuctype = '库存' or ws.kuctype = '待下架')"; + + + if("yes".equals(aldown)){ + tsqlz = "select ws.base_unit,ws.zhong_wen_qch, ws.ku_wei_bian_ma,ws.bin_id,ws.shp_ming_cheng,cast(sum(ws.base_goodscount) as signed) as goods_qua, mb.qu_huo_ci_xu, ws.goods_pro_data" + + " from wv_stock ws, md_bin mb where " + + " ws.ku_wei_bian_ma = mb.ku_wei_bian_ma and mb.ting_yong <> 'Y' and (ws.kuctype = '库存' or ws.kuctype = '待下架')"; + + } + if (StringUtil.isNotEmpty(tuopanma)) { tsqlz = tsqlz + " and ws.bin_id like '%" + tuopanma + "%' "; } diff --git a/src/main/resources/dbconfig.properties b/src/main/resources/dbconfig.properties index 7821b221..c226c0ef 100644 --- a/src/main/resources/dbconfig.properties +++ b/src/main/resources/dbconfig.properties @@ -18,14 +18,7 @@ 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://122.152.215.195:3306/wms?useUnicode=true&characterEncoding=UTF-8 -#jdbc.username.jeecg=sap -#jdbc.password.jeecg=saperp@19 -# jdbc.url.jeecg=jdbc:mysql://120.78.150.43:3306/wms?useUnicode=true&characterEncoding=UTF-8 -#jdbc.url.jeecg=jdbc:mysql://172.16.0.2:3306/zzjee?useUnicode=true&characterEncoding=UTF-8 - -#jdbc.url.jeecg=jdbc:mysql://218.5.177.99:9083/zzjee?useUnicode=true&characterEncoding=UTF-8 jdbc.username.jeecg=root jdbc.password.jeecg=Zzerp123 jdbc.dbType=mysql diff --git a/src/main/resources/hwmsysConfig.properties b/src/main/resources/hwmsysConfig.properties new file mode 100644 index 00000000..cd9a572c --- /dev/null +++ b/src/main/resources/hwmsysConfig.properties @@ -0,0 +1,316 @@ +\uFEFF#SESSION +sessionVersion=sessionVersion +# +templatepath=docTemp +# + +timerun=run +uploadpath=upload + +webUploadpath=D://upFiles +showAndDownUrl=systemController/showOrDownByurl.do?dbPath= + +office_home=D://OpenOffice + + +#DEV(\u5F00\u53D1\u6A21\u5F0F)/PUB(\u751F\u4EA7\u6A21\u5F0F) +sqlReadMode=PUB + +#database type for spring jdbc +jdbc.url.jeecg=mysql + +#\u6309\u94AE\u6743\u9650\u5F00\u5173 +button.authority.jeecg=true + +#auto scan menu flag true or false +auto.scan.menu.flag=false + + +# \u9A8C\u8BC1\u7801\u914D\u7F6E +# \u9A8C\u8BC1\u7801\u957F\u5EA6 +randCodeLength=4 +# \u9A8C\u8BC1\u7801\u7C7B\u578B\uFF1A1-\u6570\u5B57\uFF0C2-\u5C0F\u5199\u5B57\u6BCD\uFF0C3-\u5927\u5199\u5B57\u7B26\uFF0C4-\u5B57\u7B26,5-\u6DF7\u5408\u5B57\u7B26\u4E32\uFF0C +randCodeType=1 + +# \u7EC4\u7EC7\u7ED3\u6784\u7F16\u7801\u957F\u5EA6\u7C7B\u578B\uFF1A2-\u4E24\u4F4D\u6570\u5B57\u30013-3\u4E3A\u6570\u5B57\uFF0C\u5982\u679C\u7C7B\u578B\u4E0D\u662F2\u6216\u80053\uFF0C\u5219\u957F\u5EA6\u9ED8\u8BA4\u4E3A\u4E24\u4F4D\uFF1B +orgCodeLengthType=2 +# \u7C7B\u578B\u7ED3\u6784\u7F16\u7801\u957F\u5EA6\u7C7B\u578B\uFF1A2-\u4E24\u4F4D\u6570\u5B57\u30013-3\u4F4D\u6570\u5B57\u4F9D\u6B21\u7C7B\u63A8,\u6700\u4F4E2\u4F4D +categoryCodeLengthType=2 + + + +#on \u542F\u7528\u6A21\u7CCA off *\u53F7\u4EE3\u8868\u6A21\u7CCA +sysfuzseach=on + +mail.smtpHost=smtp.163.com +mail.sender=cao6512931@163.com +mail.user=cao6512931 +mail.pwd=123qwe + + + + +#\u7535\u5546\u63A5\u53E3 +#http://218.5.177.99:81/dsc/api.php?app_key=B92BB31B-A746-49A7-8393-2147D6EA588D&method=dsc.order.list.get +dsc.url=http://218.5.177.99:81/dsc/api.php +dsc.key=B92BB31B-A746-49A7-8393-2147D6EA588D + + +#uas\u63A5\u53E3 +uas.url=http://36.110.2.114:8099/XKN/ +uas.userName=xknTest +uas.passWord=xknTest123 +uas.master=XKN_TEST +uas.cuscode=xkn + + + +#sap +rfc.clientName=300 +rfc.userid=DY_EZCAO +rfc.password=123123 +rfc.language=ZH +rfc.host=192.168.254.99 +rfc.system=00 + + + + +#e3 +E3.url=http://121.199.171.146/e3_cs/webopm/web/ +E3.key=BAISON_E3_BSWMS +E3.secret=770e253089a257a8070f984d5505aee2 + + +#\u57DF\u9A8C\u8BC1 +#user.login.type=ldap +user.login.type=system + +ldap.DOMAIN_NAME=ARTGRI +ldap.DOMAIN_SUFFIX=COM +ldap.LDAP_SERVER_IP=192.168.254.26 +ldap.LDAP_PORTAL=389 + + +#\u8C03\u7528\u65B9id +from_account=fzcsxc +#\u63D0\u4F9B\u65B9id +to_account = to_fzcsxc +#\u5E94\u7528key +app_key=opa25e0e3864460573f +#\u5E94\u7528\u5BC6\u94A5 +app_secret=b28a5fd5251145729dc29e3600360873 +#\u7F51\u7AD9api\u7684url +baseURL=https://api.yonyouup.com/api/ +#\u83B7\u53D6token\u7684url +api_url_token_get=https://api.yonyouup.com/system/token?from_account={from_account}&app_key={app_key}&app_secret={app_secret} +#\u83B7\u53D6trade_id \u7684url +api_url_trade_get = https://api.yonyouup.com/system/tradeid?from_account={from_account}&app_key={app_key}&token={token} +#\u83B7\u53D6orderstatus\u7684url +api_url_orderstatus_get = https://api.yonyouup.com/orderstatus/get?from_account={from_account}&to_account={to_account}&app_key={app_key}&token={token} +#\u83B7\u53D6\u7ED3\u679C\u7684url +api_url_result_get = https://api.yonyouup.com/result?requestid={requestid} + + +#\u542F\u7528HITI +hiti=off + +#\u5141\u8BB8\u8D85\u6536 y\u5141\u8BB8 n\u4E0D\u5141\u8BB8 +chaoshou=y + +#\u6253\u5370\u65B9\u5F0F excel page +printtype=page + +binStoress=01A +moveStats=\u8BA1\u5212\u4E2D + +#nocheck \u4E0D\u68C0\u67E5 +nocheck=no + + + +#\u5BFC\u51FA\u5168\u90E8\u4E3A\u6587\u672C +exceltxt=yes + + +##isSend =0:\u4E0D\u53D1\u9001\uFF0CisSend=1:\u53D1\u9001(\u9ED8\u8BA4) +#sms.tip.control=1 +##\u663E\u793A\u6258\u76D8 +#systuopan=yes +#\u5BF9\u8D26\u5355\u663E\u793A\u660E\u7EC6 +#sysdzd=yes +#\u4ED3\u5E93\u4FE1\u606F +#comname=\u6CC9\u5DDE\u65B0\u96C5\u4ED5\u51B7\u94FE\u7269\u6D41\u4E2D\u5FC3 +#comaddr=\u6CC9\u5DDE\u5E02\u6E05\u6FDB\u5F00\u53D1\u533A\u5B89\u6CF0\u8DEF1\u53F7 +#comtel=0595-22996006 0595-22996007 +##\u5BF9\u8D26\u4FE1\u606F +#comfiname=\u6CC9\u5DDE\u65B0\u96C5\u4ED5\u51B7\u94FE\u7269\u6D41\u6709\u9650\u516C\u53F8 +#comfiaddr=\u798F\u5EFA\u7701\u6CC9\u5DDE\u5E02\u9CA4\u57CE\u533A\u6C5F\u5357\u8857\u9053\u767B\u5CF0\u793E\u533A\u53CC\u5751\u5D0E\u6BB5 +#comfitel=15059713100/0595-22996665 +#comfibankid=35050165683600000101 +#comfibankname=\u5EFA\u8BBE\u94F6\u884C\u6CC9\u5DDE\u5C55\u89C8\u57CE\u652F\u884C +#comfizhucehao=91350500MA2YF39RXK +#comfibeizhu1=1.\u4E59\u65B9\u5982\u5BF9\u5177\u4F53\u6570\u989D\u6709\u5F02\u8BAE\u5E94\u5728\u4E24\u4E2A\u5DE5\u4F5C\u65E5\u5185\u4EE5\u4E66\u9762\u5F62\u5F0F\u63D0\u51FA\uFF0C\u5426\u5219\u89C6\u4E3A\u4E59\u65B9\u786E\u8BA4 +#comfibeizhu2=2.\u4E59\u65B9\u5728\u6B21\u67085\u53F7\u524D\u5C06\u6240\u6709\u8D39\u7528\u652F\u4ED8\u5230\u7532\u65B9\u6307\u5B9A\u94F6\u884C\u5E10\u6237 +#comfibeizhu3=\u611F\u8C22\u8D35\u53F8\u4E00\u76F4\u4EE5\u6765\u7684\u652F\u6301\u548C\u60E0\u987E\uFF01 +#comfidzyz=D://upFiles//yyz.jpg +#comfilogo=D://upFiles//logo.jpg +##1:\u4E0D\u6EE1\u4E00\u5428\u7B97\u4E00\u5428; 0: \u5B9E\u9645\u8BA1\u8D39 +#jifeitype=1 +# +##\u6309SKU\u8BA1\u7B97\u4ED3\u79DF 1 \u5426\u5219\u6309\u50A8\u4F4D\u548C\u6258\u76D80 +#ckjf=0 +# +##\u4E0B\u67B6\u81EA\u52A8\u786E\u8BA4 +#autocon=no +# +##\u6309\u5269\u4F59\u6570\u91CF\u6536\u8D27 yes \u6309\u7801\u76D8\u6536\u8D27 no +#giwq=no +# +##\u662F\u5426\u542F\u7528\u6258\u76D8 yes \u542F\u7528 no \u4E0D\u542F\u7528 +#usetuopan=no +##\u662F\u5426\u542F\u7528\u751F\u4EA7\u65E5\u671F +#scrqon=yes +#scrq=2099-12-31 +# +##\u662F\u5426\u542F\u7528\u5546\u54C1\u6761\u7801 +#sptmon=no + + +#hrbengin +####\u663E\u793A\u6258\u76D8 +#systuopan=yes +##\u4ED3\u5E93\u4FE1\u606F +#comname=\u5E7F\u4E1C\u6D77\u6DA6\u51B7\u94FE\u7269\u6D41\u6709\u9650\u516C\u53F8 +#comaddr=\u9976\u5E73\u53BF\u6D77\u5C71\u9547\u4E09\u767E\u95E8\u6E2F +#comtel= +##\u5BF9\u8D26\u4FE1\u606F +#comfiname=\u5E7F\u4E1C\u6D77\u6DA6\u51B7\u94FE\u7269\u6D41\u6709\u9650\u516C\u53F8 +#comfiaddr=\u9976\u5E73\u53BF\u6D77\u5C71\u9547\u4E09\u767E\u95E8\u6E2F +#comfitel= +#comfibankid= +#comfibankname= +#comfizhucehao= +#comfibeizhu1=1.\u4E59\u65B9\u5982\u5BF9\u5177\u4F53\u6570\u989D\u6709\u5F02\u8BAE\u5E94\u5728\u4E24\u4E2A\u5DE5\u4F5C\u65E5\u5185\u4EE5\u4E66\u9762\u5F62\u5F0F\u63D0\u51FA\uFF0C\u5426\u5219\u89C6\u4E3A\u4E59\u65B9\u786E\u8BA4 +#comfibeizhu2=2.\u4E59\u65B9\u5728\u6B21\u67085\u53F7\u524D\u5C06\u6240\u6709\u8D39\u7528\u652F\u4ED8\u5230\u7532\u65B9\u6307\u5B9A\u94F6\u884C\u5E10\u6237 +#comfibeizhu3=\u611F\u8C22\u8D35\u53F8\u4E00\u76F4\u4EE5\u6765\u7684\u652F\u6301\u548C\u60E0\u987E\uFF01 +#comfidzyz=D://upFiles//yyz.jpg +#comfilogo=D://upFiles//logo.jpg +# +## 1:\u4E0D\u6EE1\u4E00\u5428\u7B97\u4E00\u5428; 0: \u5B9E\u9645\u8BA1\u8D39 +#jifeitype=0 +# +## 1\uFF1A\u6309SKU\u8BA1\u7B97\u4ED3\u79DF 0\uFF1A\u5426\u5219\u6309\u50A8\u4F4D\u548C\u6258\u76D8 +#ckjf=1 +# +# +##\u4E0B\u67B6\u81EA\u52A8\u786E\u8BA4 yes \u70BA\u81EA\u52D5\u78BA\u8A8D no \u70BA\u624B\u5DE5\u78BA\u8A8D +#autocon=yes +# +##\u6309\u5269\u4F59\u6570\u91CF\u6536\u8D27 yes \u6309\u7801\u76D8\u6536\u8D27 no +#giwq=no +# +##\u662F\u5426\u542F\u7528\u6258\u76D8 yes \u542F\u7528 no \u4E0D\u542F\u7528 +#usetuopan=no +##\u56FA\u5B9A\u6258\u76D8\u7801 +#tuopanma=1 + + +## +##\u662F\u5426\u542F\u7528\u751F\u4EA7\u65E5\u671F no\u4E3A\u4E0D\u542F\u7528 \u751F\u4EA7\u65E5\u671F\u5168\u90E8\u4E3A2099-12-31 +#scrqon=no +#scrq=2099-12-31 +# +##\u662F\u5426\u542F\u7528\u5546\u54C1\u6761\u7801 no\u4E3A\u4E0D\u542F\u7528 yes \u5553\u7528 +#sptmon=no +# +#hrend + + +#beijing +##\u663E\u793A\u6258\u76D8 +systuopan=yes +#\u5BF9\u8D26\u5355\u663E\u793A\u660E\u7EC6 +sysdzd=yes +#\u4ED3\u5E93\u4FE1\u606F +comname=\u798F\u5EFA\u6D77\u6587\u94ED\u6D77\u6D0B\u79D1\u6280\u53D1\u5C55\u6709\u9650\u516C\u53F8 +comaddr=\u798F\u5EFA\u7701\u798F\u5DDE\u9A6C\u5C3E\u533A\u9A6C\u5C3E\u81EA\u8D38\u533A\u4EAD\u6C5F\u9547\u957F\u7965\u8DEF67\u53F7 +comtel=0591-83589937 +#\u5BF9\u8D26\u4FE1\u606F +comfiname=\u798F\u5EFA\u6D77\u6587\u94ED\u6D77\u6D0B\u79D1\u6280\u53D1\u5C55\u6709\u9650\u516C\u53F8 +comfiaddr=\u798F\u5EFA\u7701\u798F\u5DDE\u9A6C\u5C3E\u533A\u9A6C\u5C3E\u81EA\u8D38\u533A\u4EAD\u6C5F\u9547\u957F\u7965\u8DEF67\u53F7 +comfitel=0591-83589937 +comfibankid= +comfibankname= +comfizhucehao= +comfibeizhu1=1.\u4E59\u65B9\u5982\u5BF9\u5177\u4F53\u6570\u989D\u6709\u5F02\u8BAE\u5E94\u5728\u4E24\u4E2A\u5DE5\u4F5C\u65E5\u5185\u4EE5\u4E66\u9762\u5F62\u5F0F\u63D0\u51FA\uFF0C\u5426\u5219\u89C6\u4E3A\u4E59\u65B9\u786E\u8BA4 +comfibeizhu2=2.\u4E59\u65B9\u5728\u6B21\u67085\u53F7\u524D\u5C06\u6240\u6709\u8D39\u7528\u652F\u4ED8\u5230\u7532\u65B9\u6307\u5B9A\u94F6\u884C\u5E10\u6237 +comfibeizhu3=\u611F\u8C22\u8D35\u53F8\u4E00\u76F4\u4EE5\u6765\u7684\u652F\u6301\u548C\u60E0\u987E\uFF01 +comfidzyz=D://upFiles//yyz.jpg +comfilogo=D://upFiles//logo.jpg +#1:\u4E0D\u6EE1\u4E00\u5428\u7B97\u4E00\u5428; 0: \u5B9E\u9645\u8BA1\u8D39 +jifeitype=1 + +#\u6309SKU\u8BA1\u7B97\u4ED3\u79DF 1 \u5426\u5219\u6309\u50A8\u4F4D\u548C\u6258\u76D80 +ckjf=0 + +#\u4E0B\u67B6\u81EA\u52A8\u786E\u8BA4 +autocon=no + +#\u6309\u5269\u4F59\u6570\u91CF\u6536\u8D27 yes \u6309\u7801\u76D8\u6536\u8D27 no +giwq=yes + +#\u662F\u5426\u542F\u7528\u6258\u76D8 yes \u542F\u7528 no \u4E0D\u542F\u7528 +usetuopan=yes +#\u56FA\u5B9A\u6258\u76D8\u7801 +tuopanma=A +#\u662F\u5426\u542F\u7528\u751F\u4EA7\u65E5\u671F +scrqon=yes +scrq=2099-12-31 + + + +#\u662F\u5426\u542F\u7528\u5546\u54C1\u6761\u7801 +sptmon=no +#beijingend + +yydbkey=mssql +yy.cuscode=hwm + + +interfacetype=DSC + +#\u96C6\u56E2\u7248\u672C on +comgroup=on + +#\u62E3\u8D27\u5355\u5355\u4F4D +tijiunit=\u7ACB\u65B9\u5206\u7C73 +zhongliangunit=\u516C\u65A4 + +#\u4E00\u6B65\u4E0A\u67B6 +webonestepup=off +onestepup=off + +#\u5165\u5E93\u5355\u548C\u51FA\u5E93\u5355\u7248\u672C +wm.ckd=hr +wm.rkd=hr + +#show.noticeurl=http://localhost:8081/jeewms/wmOmNoticeHController.do?showlist&id= +#show.goodsurl=http://localhost:8081/jeewms/wmOmNoticeHController.do?showgoods&id= +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 + + +sys.del=database +wm.alldown=yes + + + + + + + + + diff --git a/src/main/resources/jeecg/jeecg_database.properties b/src/main/resources/jeecg/jeecg_database.properties index a2b6cf46..53ab13be 100644 --- a/src/main/resources/jeecg/jeecg_database.properties +++ b/src/main/resources/jeecg/jeecg_database.properties @@ -1,9 +1,5 @@ #mysql diver_name=com.mysql.jdbc.Driver -#url=jdbc:mysql://122.152.215.195:3306/wms?useUnicode=true&characterEncoding=UTF-8 -#jdbc.username.jeecg=sap -#jdbc.password.jeecg=saperp@19 - url=jdbc:mysql://localhost:3306/wms?useUnicode=true&characterEncoding=UTF-8 username=root password=Zzerp123 diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties index fdb4ca46..ae2e9e22 100644 --- a/src/main/resources/sysConfig.properties +++ b/src/main/resources/sysConfig.properties @@ -212,6 +212,7 @@ wms.totms=no sys.del=database +wm.alldown=yes