diff --git a/jnpf-app/App.vue b/jnpf-app/App.vue index dba4d784..71ef1873 100644 --- a/jnpf-app/App.vue +++ b/jnpf-app/App.vue @@ -44,7 +44,7 @@ } }) this.handlePush() - this.getAppVersion() + // this.getAppVersion() // #endif }, methods: { diff --git a/jnpf-app/manifest.json b/jnpf-app/manifest.json index b49d7bce..749a6afd 100644 --- a/jnpf-app/manifest.json +++ b/jnpf-app/manifest.json @@ -1,213 +1,212 @@ { - "name": "jnpf java版", - "appid": "__UNI__663111E", - "description": "专注信息化平台、软件开发、app开发", - "versionName": "3.4.76", - "versionCode": 139, - "transformPx": false, - "app-plus": { - "compatible": { - "ignoreVersion": true - }, - /* 5+App特有相关 */ - "usingComponents": true, - "splashscreen": { - "alwaysShowBeforeRender": false, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": { - "Maps": {}, - "OAuth": {}, - "Speech": {}, - "Barcode": {}, - "Camera": {}, - "Push": {} - }, - /* 模块配置 */ - "distribute": { - /* 应用发布信息 */ - "android": { - /* android打包配置 */ - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "schemes": "jnpf", - "minSdkVersion": 22, - "targetSdkVersion": 26, - "abiFilters": ["armeabi-v7a", "arm64-v8a"] - }, - "ios": { - "privacyDescription": { - "NSPhotoLibraryUsageDescription": "以便于修改头像等功能图片上传", - "NSPhotoLibraryAddUsageDescription": "以便于修改头像等功能图片上传", - "NSCameraUsageDescription": "以便于修改头像等功能图片上传", - "NSLocationAlwaysAndWhenInUseUsageDescription": "以便于定位当前位置等功能", - "NSLocationAlwaysUsageDescription": "以便于定位当前位置等功能", - "NSLocationWhenInUseUsageDescription": "以便于定位当前位置等功能", - "NSMicrophoneUsageDescription": "以便于使用语音、录制音频等功能", - "NSCalendarsUsageDescription": "以便于更好的办公", - "NSContactsUsageDescription": "以便于更好的沟通", - "NSSpeechRecognitionUsageDescription": "", - "NSAppleMusicUsageDescription": "以便于修改头像等功能媒体资料上传", - "NSFaceIDUsageDescription": "以便于使用快捷登录等功能" - }, - "idfa": false, - "urltypes": "jnpf", - "capabilities": { - "entitlements": { - "com.apple.developer.associated-domains": ["applinks:unlink.java.jnpfsoft.com"] - } - } - }, - /* ios打包配置 */ - "sdkConfigs": { - "payment": {}, - "maps": { - "baidu": { - "appkey_ios": "CA6mx9NZ9DhTYxjVKB7Bkgr6KxpzMfO4", - "appkey_android": "1vlnkDFaZz4GxAHMMk6kwGRcZr1OfBau" - } - }, - "ad": {}, - "oauth": { - "weixin": { - "appid": "wx95396c4c5f44c077", - "appsecret": "c128e69c3cabe00c468fb177e393b6a0", - "UniversalLinks": "https://unlink.java.jnpfsoft.com/uni-universallinks/__UNI__1A48209/" - } - }, - "speech": {}, - "push": { - "unipush": {} - } - }, - "icons": { - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" - }, - "ios": { - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - }, - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - } - } - }, - "splashscreen": { - "android": { - "hdpi": "unpackage/res/startup/startup.png", - "xhdpi": "unpackage/res/startup/startup.png", - "xxhdpi": "unpackage/res/startup/startup.png" - }, - "ios": { - "iphone": { - "portrait-896h@3x": "unpackage/res/startup/startup.png", - "landscape-896h@3x": "", - "portrait-896h@2x": "unpackage/res/startup/startup.png", - "landscape-896h@2x": "", - "retina35": "unpackage/res/startup/startup.png", - "retina40l": "", - "retina40": "unpackage/res/startup/startup.png", - "retina47l": "", - "retina47": "unpackage/res/startup/startup.png", - "iphonex": "unpackage/res/startup/startup.png", - "iphonexl": "", - "retina55l": "", - "retina55": "unpackage/res/startup/startup.png" - } - }, - "androidStyle": "default" - } - }, - "nativePlugins": {} - }, - /* SDK配置 */ - "quickapp": {}, - /* 快应用特有相关 */ - "mp-weixin": { - /* 小程序特有相关 */ - "appid": "wx8f5cb90d8ff960a3", - "setting": { - "urlCheck": true, - "es6": true, - "postcss": true, - "minified": true - }, - "usingComponents": true, - "permission": { - "scope.userLocation": { - "desc": "你的位置信息将用于小程序位置接口的效果展示" - } - }, - // "uniStatistics" : { - // "enable" : false - // }, - "optimization": { - "subPackages": true - } - }, - "h5": { - "sdkConfigs": { - "maps": {} - }, - "title": "jnpf java版", - "template": "template.h5.html", - "domain": "https://app.java.jnpfsoft.com", - "router": { - "mode": "history" - }, - "devServer": { - "disableHostCheck": true, - "proxy": { - "/api": { - "target": "http://192.168.20.23:8080", - "changeOrigin": true, - "secure": false - } - } - } - }, - "_spaceID": "8e84eea8-6922-4033-8e86-67ad7442e692" -} \ No newline at end of file + "name" : "济钢2期APP", + "appid" : "__UNI__8C40A7C", + "description" : "专注信息化平台、软件开发、app开发", + "versionName" : "3.4.76", + "versionCode" : 139, + "transformPx" : false, + "app-plus" : { + "compatible" : { + "ignoreVersion" : true + }, + /* 5+App特有相关 */ + "usingComponents" : true, + "splashscreen" : { + "alwaysShowBeforeRender" : false, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : { + "Maps" : {}, + "OAuth" : {}, + "Speech" : {}, + "Barcode" : {}, + "Camera" : {}, + "Push" : {} + }, + /* 模块配置 */ + "distribute" : { + /* 应用发布信息 */ + "android" : { + /* android打包配置 */ + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "schemes" : "jnpf", + "minSdkVersion" : 22, + "targetSdkVersion" : 26, + "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ] + }, + "ios" : { + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "以便于修改头像等功能图片上传", + "NSPhotoLibraryAddUsageDescription" : "以便于修改头像等功能图片上传", + "NSCameraUsageDescription" : "以便于修改头像等功能图片上传", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "以便于定位当前位置等功能", + "NSLocationAlwaysUsageDescription" : "以便于定位当前位置等功能", + "NSLocationWhenInUseUsageDescription" : "以便于定位当前位置等功能", + "NSMicrophoneUsageDescription" : "以便于使用语音、录制音频等功能", + "NSCalendarsUsageDescription" : "以便于更好的办公", + "NSContactsUsageDescription" : "以便于更好的沟通", + "NSSpeechRecognitionUsageDescription" : "", + "NSAppleMusicUsageDescription" : "以便于修改头像等功能媒体资料上传", + "NSFaceIDUsageDescription" : "以便于使用快捷登录等功能" + }, + "idfa" : false, + "urltypes" : "jnpf", + "capabilities" : { + "entitlements" : { + "com.apple.developer.associated-domains" : [ "applinks:unlink.java.jnpfsoft.com" ] + } + }, + "dSYMs" : false + }, + /* ios打包配置 */ + "sdkConfigs" : { + "payment" : {}, + "maps" : { + "baidu" : { + "appkey_ios" : "CA6mx9NZ9DhTYxjVKB7Bkgr6KxpzMfO4", + "appkey_android" : "1vlnkDFaZz4GxAHMMk6kwGRcZr1OfBau" + } + }, + "ad" : {}, + "oauth" : { + "weixin" : { + "appid" : "wx95396c4c5f44c077", + "appsecret" : "c128e69c3cabe00c468fb177e393b6a0", + "UniversalLinks" : "https://unlink.java.jnpfsoft.com/uni-universallinks/__UNI__1A48209/" + } + }, + "speech" : {}, + "push" : {} + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + }, + "splashscreen" : { + "android" : { + "hdpi" : "unpackage/res/startup/startup.png", + "xhdpi" : "unpackage/res/startup/startup.png", + "xxhdpi" : "unpackage/res/startup/startup.png" + }, + "ios" : { + "iphone" : { + "portrait-896h@3x" : "unpackage/res/startup/startup.png", + "landscape-896h@3x" : "", + "portrait-896h@2x" : "unpackage/res/startup/startup.png", + "landscape-896h@2x" : "", + "retina35" : "unpackage/res/startup/startup.png", + "retina40l" : "", + "retina40" : "unpackage/res/startup/startup.png", + "retina47l" : "", + "retina47" : "unpackage/res/startup/startup.png", + "iphonex" : "unpackage/res/startup/startup.png", + "iphonexl" : "", + "retina55l" : "", + "retina55" : "unpackage/res/startup/startup.png" + } + }, + "androidStyle" : "default" + } + }, + "nativePlugins" : {} + }, + /* SDK配置 */ + "quickapp" : {}, + /* 快应用特有相关 */ + "mp-weixin" : { + /* 小程序特有相关 */ + "appid" : "wx8f5cb90d8ff960a3", + "setting" : { + "urlCheck" : true, + "es6" : true, + "postcss" : true, + "minified" : true + }, + "usingComponents" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "你的位置信息将用于小程序位置接口的效果展示" + } + }, + // "uniStatistics" : { + // "enable" : false + // }, + "optimization" : { + "subPackages" : true + } + }, + "h5" : { + "sdkConfigs" : { + "maps" : {} + }, + "title" : "jnpf java版", + "template" : "template.h5.html", + "domain" : "https://app.java.jnpfsoft.com", + "router" : { + "mode" : "history" + }, + "devServer" : { + "disableHostCheck" : true, + "proxy" : { + "/api" : { + "target" : "http://192.168.20.23:8080", + "changeOrigin" : true, + "secure" : false + } + } + } + }, + "_spaceID" : "8e84eea8-6922-4033-8e86-67ad7442e692" +} diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue index 848c0d3f..57dd8328 100644 --- a/jnpf-app/pages/index/portal.vue +++ b/jnpf-app/pages/index/portal.vue @@ -48,10 +48,10 @@ - + diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventoryLogMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventoryLogMapper.xml index 413cac91..1568c341 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventoryLogMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventoryLogMapper.xml @@ -33,6 +33,9 @@ + + + SELECT a.*, diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventorySnapshotMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventorySnapshotMapper.xml index d6cc9909..222b962f 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventorySnapshotMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventorySnapshotMapper.xml @@ -45,6 +45,11 @@ + + + + +