From e4cb72ce0502ca1006727198cd77264b14fda78e Mon Sep 17 00:00:00 2001 From: zc <zc> Date: 星期三, 24 七月 2024 11:09:48 +0800 Subject: [PATCH] 视图 --- /dev/null | 113 ---------------------------- src/main/resources/mapper/LocDetlMapper.xml | 2 pom.xml | 1 src/main/resources/application.yml | 114 ++++++++++++++++++++++++++++ src/main/java/asr_show_diff.sql | 2 5 files changed, 115 insertions(+), 117 deletions(-) diff --git a/pom.xml b/pom.xml index 0431338..3b13975 100644 --- a/pom.xml +++ b/pom.xml @@ -117,6 +117,7 @@ </dependencies> + <build> <finalName>xgmFlwms</finalName> <plugins> diff --git a/src/main/java/asr_show_diff.sql b/src/main/java/asr_show_diff.sql index 6b1df35..f06fdb0 100644 --- a/src/main/java/asr_show_diff.sql +++ b/src/main/java/asr_show_diff.sql @@ -7,7 +7,7 @@ FROM ( SELECT CAST - ( SUM ( qty ) AS INT ) asrsQty, + ( SUM ( anfme ) AS INT ) asrsQty, 0 AS erpQty, matnr, specs, diff --git a/src/main/resources/application-mac.yml b/src/main/resources/application-mac.yml deleted file mode 100644 index 8b9424a..0000000 --- a/src/main/resources/application-mac.yml +++ /dev/null @@ -1,115 +0,0 @@ -server: - port: 8080 - servlet: - context-path: /@pom.build.finalName@ - -spring: - application: - name: @pom.build.finalName@ - jmx: - enabled: false - datasource: - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - #url: jdbc:sqlserver://127.0.0.1:1433;databasename=xgmFlasrs - url: jdbc:sqlserver://192.168.4.138:1433;databasename=xgmFlasrs - username: sa - password: sa@123 - #password: Zoneyung@zy56$ - mvc: - static-path-pattern: /** - redis: - host: localhost - port: 6379 - database: 0 -# password: xltys1995 - servlet: - multipart: - maxFileSize: 100MB - maxRequestSize: 100MB - -mybatis-plus: - mapper-locations: classpath:mapper/*.xml - -logging: - path: stock/out/@pom.build.finalName@/logs - -super: - pwd: xltys1995 - -swagger: - enable: false - -#License鐩稿叧閰嶇疆 -license: - subject: gdkyasrs - publicAlias: publicCert - storePass: public_zhongyang_123456789 - licensePath: license.lic - publicKeysStorePath: publicCerts.keystore - -# 涓嬩綅鏈洪厤缃� -wcs-slave: - # 鍙屾繁 - doubleDeep: true - # 鍙屾繁搴撲綅鎺掑彿 - doubleLocs: 1,4,5,8,9,12,13,16 - # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� - groupCount: 4 - # 宸︽繁搴撲綅鎺掑彿 - doubleLocsLeft: 1,5,9,13 - # 鍙虫繁搴撲綅鎺掑彿 - doubleLocsRight: 4,8,12,16 -# wms鍙傛暟閰嶇疆 -wms-parameter: - # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏� - automaticFillingBoardStaNosBoolean: false - # 鑷姩琛ョ┖鏉跨珯鐐� - automaticFillingBoardStaNos: 112,101 - # 鑷姩绉诲簱鍔熻兘寮�鍏� - autoLocMoveBoolean: false - # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎 - autoLocMoveUnilateralBoolean: false - -comb: - limit: 5000 - -#erp瀵规帴 -erp: - # 寮�鍏� - switch: - #鑾峰彇鍗曟嵁寮�鍏� - InboundOrderSwitch: false - #鐧诲綍鎺ュ彛寮�鍏� - LoginAuthenticationSwitch: false - #涓婃姤銆佸鏍稿崟鎹紑鍏� - ReviewOrderSwitch: false - # 鍦板潃 - address: - URL: http://58.210.10.90:28090 - #鐧诲綍鍦板潃 - loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc - #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧� - inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc - #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧� - outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc - #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧� - outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc - #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧� - outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc - # 鐧诲綍璐﹀彿绠$悊 - login : - acctID: "647e849ab6fa0f" - username: "llw" - password: "666666" - lcid: 2052 - - #ERP鎺ュ彛 - enabled: true - # enabled: false - #鏌ョ湅ERP涓棿琛ㄩ棿闅� - refreshtime: 0/5 * * * * ? - db: - driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://192.168.4.138:1433;databasename=XDLinkLK2 - username: sa - password: sa@123 \ No newline at end of file diff --git a/src/main/resources/application-win.yml b/src/main/resources/application-win.yml deleted file mode 100644 index 62c0926..0000000 --- a/src/main/resources/application-win.yml +++ /dev/null @@ -1,113 +0,0 @@ -server: - port: 8080 - servlet: - context-path: /@pom.build.finalName@ - -spring: - application: - name: @pom.build.finalName@ - jmx: - enabled: false - datasource: - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://127.0.0.1:1433;databasename=xgmFlasrs - username: sa - password: sa@123 - mvc: - static-path-pattern: /** - redis: - host: localhost - port: 6379 - database: 0 -# password: xltys1995 - servlet: - multipart: - maxFileSize: 100MB - maxRequestSize: 100MB - -mybatis-plus: - mapper-locations: classpath:mapper/*.xml - -logging: - path: /stock/out/@pom.build.finalName@/logs - -super: - pwd: xltys1995 - -swagger: - enable: false - -#License鐩稿叧閰嶇疆 -license: - subject: gdkyasrs - publicAlias: publicCert - storePass: public_zhongyang_123456789 - licensePath: license.lic - publicKeysStorePath: publicCerts.keystore - -# 涓嬩綅鏈洪厤缃� -wcs-slave: - # 鍙屾繁 - doubleDeep: true - # 鍙屾繁搴撲綅鎺掑彿 - doubleLocs: 1,4,5,8,9,12,13,16 - # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� - groupCount: 4 - # 宸︽繁搴撲綅鎺掑彿 - doubleLocsLeft: 1,5,9,13 - # 鍙虫繁搴撲綅鎺掑彿 - doubleLocsRight: 4,8,12,16 -# wms鍙傛暟閰嶇疆 -wms-parameter: - # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏� - automaticFillingBoardStaNosBoolean: false - # 鑷姩琛ョ┖鏉跨珯鐐� - automaticFillingBoardStaNos: 112,101 - # 鑷姩绉诲簱鍔熻兘寮�鍏� - autoLocMoveBoolean: false - # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎 - autoLocMoveUnilateralBoolean: false - -comb: - limit: 5000 - -#erp瀵规帴 -erp: - # 寮�鍏� - switch: - #鑾峰彇鍗曟嵁寮�鍏� - InboundOrderSwitch: false - #鐧诲綍鎺ュ彛寮�鍏� - LoginAuthenticationSwitch: false - #涓婃姤銆佸鏍稿崟鎹紑鍏� - ReviewOrderSwitch: false - # 鍦板潃 - address: - URL: http://58.210.10.90:28090 - #鐧诲綍鍦板潃 - loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc - #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧� - inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc - #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧� - outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc - #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧� - outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc - #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧� - outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc - # 鐧诲綍璐﹀彿绠$悊 - login : - acctID: "647e849ab6fa0f" - username: "llw" - password: "666666" - lcid: 2052 - - #ERP鎺ュ彛 - enabled: true - # enabled: false - #鏌ョ湅ERP涓棿琛ㄩ棿闅� - refreshtime: 0/5 * * * * ? - db: - driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://127.0.0.1:1433;databasename=XDLinkLK2 - username: sa - password: sa@123 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f1f1d1a..f5c83fc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,113 @@ +server: + port: 8084 + servlet: + context-path: /@pom.build.finalName@ + spring: - profiles: - active: win \ No newline at end of file + application: + name: @pom.build.finalName@ + jmx: + enabled: false + datasource: + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + url: jdbc:sqlserver://127.0.0.1:1433;databasename=xgmFlasrs + username: sa + password: sa@123 + mvc: + static-path-pattern: /** + redis: + host: localhost + port: 6379 + database: 0 +# password: xltys1995 + servlet: + multipart: + maxFileSize: 100MB + maxRequestSize: 100MB + +mybatis-plus: + mapper-locations: classpath:mapper/*.xml + +logging: + path: /stock/out/@pom.build.finalName@/logs + +super: + pwd: xltys1995 + +swagger: + enable: false + +#License鐩稿叧閰嶇疆 +license: + subject: gdkyasrs + publicAlias: publicCert + storePass: public_zhongyang_123456789 + licensePath: license.lic + publicKeysStorePath: publicCerts.keystore + +# 涓嬩綅鏈洪厤缃� +wcs-slave: + # 鍙屾繁 + doubleDeep: true + # 鍙屾繁搴撲綅鎺掑彿 + doubleLocs: 1,4,5,8,9,12,13,16 + # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� + groupCount: 4 + # 宸︽繁搴撲綅鎺掑彿 + doubleLocsLeft: 1,5,9,13 + # 鍙虫繁搴撲綅鎺掑彿 + doubleLocsRight: 4,8,12,16 +# wms鍙傛暟閰嶇疆 +wms-parameter: + # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏� + automaticFillingBoardStaNosBoolean: false + # 鑷姩琛ョ┖鏉跨珯鐐� + automaticFillingBoardStaNos: 112,101 + # 鑷姩绉诲簱鍔熻兘寮�鍏� + autoLocMoveBoolean: false + # 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎 + autoLocMoveUnilateralBoolean: false + +comb: + limit: 5000 + +#erp瀵规帴 +erp: + # 寮�鍏� + switch: + #鑾峰彇鍗曟嵁寮�鍏� + InboundOrderSwitch: false + #鐧诲綍鎺ュ彛寮�鍏� + LoginAuthenticationSwitch: false + #涓婃姤銆佸鏍稿崟鎹紑鍏� + ReviewOrderSwitch: false + # 鍦板潃 + address: + URL: http://58.210.10.90:28090 + #鐧诲綍鍦板潃 + loginaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser.common.kdsvc + #鍗曟嵁锛屽晢鍝佹。妗堝湴鍧� + inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc + #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧� + outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc + #缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧� + outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc + #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧� + outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc + # 鐧诲綍璐﹀彿绠$悊 + login : + acctID: "647e849ab6fa0f" + username: "llw" + password: "666666" + lcid: 2052 + + #ERP鎺ュ彛 + #enabled: true + enabled: false + #鏌ョ湅ERP涓棿琛ㄩ棿闅� + refreshtime: 0/5 * * * * ? + db: + driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver + url: jdbc:sqlserver://192.168.1.147:1433;databasename=XDLinkLK2 + username: sa + password: sa@123 diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml index b4459a5..e7bd9f2 100644 --- a/src/main/resources/mapper/LocDetlMapper.xml +++ b/src/main/resources/mapper/LocDetlMapper.xml @@ -423,7 +423,7 @@ and asrsQty != erpQty </if> <if test="different != null and different == 0 "> - and asrsQty == erpQty + and asrsQty = erpQty </if> <if test="matnr != null"> AND matnr like #{matnr} -- Gitblit v1.9.1