yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5.28修改

Browse Source
jg-waiwang-pro
胡川虎 5 months ago
parent 2f0f64e293
commit 0e269ea7b1
8 changed files with 235 additions and 215 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-app/App.vue
Unescape View File

@ -44,7 +44,7 @@
} }
}) })
this.handlePush() this.handlePush()
this.getAppVersion() // this.getAppVersion()
// #endif // #endif
}, },
methods: { methods: {

423
jnpf-app/manifest.json
Unescape View File

@ -1,213 +1,212 @@
{ {
"name": "jnpf java版", "name" : "济钢2期APP",
"appid": "__UNI__663111E", "appid" : "__UNI__8C40A7C",
"description": "专注信息化平台、软件开发、app开发", "description" : "专注信息化平台、软件开发、app开发",
"versionName": "3.4.76", "versionName" : "3.4.76",
"versionCode": 139, "versionCode" : 139,
"transformPx": false, "transformPx" : false,
"app-plus": { "app-plus" : {
"compatible": { "compatible" : {
"ignoreVersion": true "ignoreVersion" : true
}, },
/* 5+App特有相关 */ /* 5+App特有相关 */
"usingComponents": true, "usingComponents" : true,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": false, "alwaysShowBeforeRender" : false,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
"modules": { "modules" : {
"Maps": {}, "Maps" : {},
"OAuth": {}, "OAuth" : {},
"Speech": {}, "Speech" : {},
"Barcode": {}, "Barcode" : {},
"Camera": {}, "Camera" : {},
"Push": {} "Push" : {}
}, },
/* 模块配置 */ /* 模块配置 */
"distribute": { "distribute" : {
/* 应用发布信息 */ /* 应用发布信息 */
"android": { "android" : {
/* android打包配置 */ /* android打包配置 */
"permissions": [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>", "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>", "<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"schemes": "jnpf", "schemes" : "jnpf",
"minSdkVersion": 22, "minSdkVersion" : 22,
"targetSdkVersion": 26, "targetSdkVersion" : 26,
"abiFilters": ["armeabi-v7a", "arm64-v8a"] "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
}, },
"ios": { "ios" : {
"privacyDescription": { "privacyDescription" : {
"NSPhotoLibraryUsageDescription": "以便于修改头像等功能图片上传", "NSPhotoLibraryUsageDescription" : "以便于修改头像等功能图片上传",
"NSPhotoLibraryAddUsageDescription": "以便于修改头像等功能图片上传", "NSPhotoLibraryAddUsageDescription" : "以便于修改头像等功能图片上传",
"NSCameraUsageDescription": "以便于修改头像等功能图片上传", "NSCameraUsageDescription" : "以便于修改头像等功能图片上传",
"NSLocationAlwaysAndWhenInUseUsageDescription": "以便于定位当前位置等功能", "NSLocationAlwaysAndWhenInUseUsageDescription" : "以便于定位当前位置等功能",
"NSLocationAlwaysUsageDescription": "以便于定位当前位置等功能", "NSLocationAlwaysUsageDescription" : "以便于定位当前位置等功能",
"NSLocationWhenInUseUsageDescription": "以便于定位当前位置等功能", "NSLocationWhenInUseUsageDescription" : "以便于定位当前位置等功能",
"NSMicrophoneUsageDescription": "以便于使用语音、录制音频等功能", "NSMicrophoneUsageDescription" : "以便于使用语音、录制音频等功能",
"NSCalendarsUsageDescription": "以便于更好的办公", "NSCalendarsUsageDescription" : "以便于更好的办公",
"NSContactsUsageDescription": "以便于更好的沟通", "NSContactsUsageDescription" : "以便于更好的沟通",
"NSSpeechRecognitionUsageDescription": "", "NSSpeechRecognitionUsageDescription" : "",
"NSAppleMusicUsageDescription": "以便于修改头像等功能媒体资料上传", "NSAppleMusicUsageDescription" : "以便于修改头像等功能媒体资料上传",
"NSFaceIDUsageDescription": "以便于使用快捷登录等功能" "NSFaceIDUsageDescription" : "以便于使用快捷登录等功能"
}, },
"idfa": false, "idfa" : false,
"urltypes": "jnpf", "urltypes" : "jnpf",
"capabilities": { "capabilities" : {
"entitlements": { "entitlements" : {
"com.apple.developer.associated-domains": ["applinks:unlink.java.jnpfsoft.com"] "com.apple.developer.associated-domains" : [ "applinks:unlink.java.jnpfsoft.com" ]
} }
} },
}, "dSYMs" : false
/* ios打包配置 */ },
"sdkConfigs": { /* ios打包配置 */
"payment": {}, "sdkConfigs" : {
"maps": { "payment" : {},
"baidu": { "maps" : {
"appkey_ios": "CA6mx9NZ9DhTYxjVKB7Bkgr6KxpzMfO4", "baidu" : {
"appkey_android": "1vlnkDFaZz4GxAHMMk6kwGRcZr1OfBau" "appkey_ios" : "CA6mx9NZ9DhTYxjVKB7Bkgr6KxpzMfO4",
} "appkey_android" : "1vlnkDFaZz4GxAHMMk6kwGRcZr1OfBau"
}, }
"ad": {}, },
"oauth": { "ad" : {},
"weixin": { "oauth" : {
"appid": "wx95396c4c5f44c077", "weixin" : {
"appsecret": "c128e69c3cabe00c468fb177e393b6a0", "appid" : "wx95396c4c5f44c077",
"UniversalLinks": "https://unlink.java.jnpfsoft.com/uni-universallinks/__UNI__1A48209/" "appsecret" : "c128e69c3cabe00c468fb177e393b6a0",
} "UniversalLinks" : "https://unlink.java.jnpfsoft.com/uni-universallinks/__UNI__1A48209/"
}, }
"speech": {}, },
"push": { "speech" : {},
"unipush": {} "push" : {}
} },
}, "icons" : {
"icons": { "android" : {
"android": { "hdpi" : "unpackage/res/icons/72x72.png",
"hdpi": "unpackage/res/icons/72x72.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxxhdpi" : "unpackage/res/icons/192x192.png"
"xxxhdpi": "unpackage/res/icons/192x192.png" },
}, "ios" : {
"ios": { "appstore" : "unpackage/res/icons/1024x1024.png",
"appstore": "unpackage/res/icons/1024x1024.png", "ipad" : {
"ipad": { "app" : "unpackage/res/icons/76x76.png",
"app": "unpackage/res/icons/76x76.png", "app@2x" : "unpackage/res/icons/152x152.png",
"app@2x": "unpackage/res/icons/152x152.png", "notification" : "unpackage/res/icons/20x20.png",
"notification": "unpackage/res/icons/20x20.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@2x": "unpackage/res/icons/40x40.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "settings" : "unpackage/res/icons/29x29.png",
"settings": "unpackage/res/icons/29x29.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@2x": "unpackage/res/icons/58x58.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight@2x" : "unpackage/res/icons/80x80.png"
"spotlight@2x": "unpackage/res/icons/80x80.png" },
}, "iphone" : {
"iphone": { "app@2x" : "unpackage/res/icons/120x120.png",
"app@2x": "unpackage/res/icons/120x120.png", "app@3x" : "unpackage/res/icons/180x180.png",
"app@3x": "unpackage/res/icons/180x180.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"notification@3x": "unpackage/res/icons/60x60.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"settings@3x": "unpackage/res/icons/87x87.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@3x" : "unpackage/res/icons/120x120.png"
"spotlight@3x": "unpackage/res/icons/120x120.png" }
} }
} },
}, "splashscreen" : {
"splashscreen": { "android" : {
"android": { "hdpi" : "unpackage/res/startup/startup.png",
"hdpi": "unpackage/res/startup/startup.png", "xhdpi" : "unpackage/res/startup/startup.png",
"xhdpi": "unpackage/res/startup/startup.png", "xxhdpi" : "unpackage/res/startup/startup.png"
"xxhdpi": "unpackage/res/startup/startup.png" },
}, "ios" : {
"ios": { "iphone" : {
"iphone": { "portrait-896h@3x" : "unpackage/res/startup/startup.png",
"portrait-896h@3x": "unpackage/res/startup/startup.png", "landscape-896h@3x" : "",
"landscape-896h@3x": "", "portrait-896h@2x" : "unpackage/res/startup/startup.png",
"portrait-896h@2x": "unpackage/res/startup/startup.png", "landscape-896h@2x" : "",
"landscape-896h@2x": "", "retina35" : "unpackage/res/startup/startup.png",
"retina35": "unpackage/res/startup/startup.png", "retina40l" : "",
"retina40l": "", "retina40" : "unpackage/res/startup/startup.png",
"retina40": "unpackage/res/startup/startup.png", "retina47l" : "",
"retina47l": "", "retina47" : "unpackage/res/startup/startup.png",
"retina47": "unpackage/res/startup/startup.png", "iphonex" : "unpackage/res/startup/startup.png",
"iphonex": "unpackage/res/startup/startup.png", "iphonexl" : "",
"iphonexl": "", "retina55l" : "",
"retina55l": "", "retina55" : "unpackage/res/startup/startup.png"
"retina55": "unpackage/res/startup/startup.png" }
} },
}, "androidStyle" : "default"
"androidStyle": "default" }
} },
}, "nativePlugins" : {}
"nativePlugins": {} },
}, /* SDK配置 */
/* SDK配置 */ "quickapp" : {},
"quickapp": {}, /* 快应用特有相关 */
/* 快应用特有相关 */ "mp-weixin" : {
"mp-weixin": { /* 小程序特有相关 */
/* 小程序特有相关 */ "appid" : "wx8f5cb90d8ff960a3",
"appid": "wx8f5cb90d8ff960a3", "setting" : {
"setting": { "urlCheck" : true,
"urlCheck": true, "es6" : true,
"es6": true, "postcss" : true,
"postcss": true, "minified" : true
"minified": true },
}, "usingComponents" : true,
"usingComponents": true, "permission" : {
"permission": { "scope.userLocation" : {
"scope.userLocation": { "desc" : "你的位置信息将用于小程序位置接口的效果展示"
"desc": "你的位置信息将用于小程序位置接口的效果展示" }
} },
}, // "uniStatistics" : {
// "uniStatistics" : { // "enable" : false
// "enable" : false // },
// }, "optimization" : {
"optimization": { "subPackages" : true
"subPackages": true }
} },
}, "h5" : {
"h5": { "sdkConfigs" : {
"sdkConfigs": { "maps" : {}
"maps": {} },
}, "title" : "jnpf java版",
"title": "jnpf java版", "template" : "template.h5.html",
"template": "template.h5.html", "domain" : "https://app.java.jnpfsoft.com",
"domain": "https://app.java.jnpfsoft.com", "router" : {
"router": { "mode" : "history"
"mode": "history" },
}, "devServer" : {
"devServer": { "disableHostCheck" : true,
"disableHostCheck": true, "proxy" : {
"proxy": { "/api" : {
"/api": { "target" : "http://192.168.20.23:8080",
"target": "http://192.168.20.23:8080", "changeOrigin" : true,
"changeOrigin": true, "secure" : false
"secure": false }
} }
} }
} },
}, "_spaceID" : "8e84eea8-6922-4033-8e86-67ad7442e692"
"_spaceID": "8e84eea8-6922-4033-8e86-67ad7442e692" }
}

4
jnpf-app/pages/index/portal.vue
Unescape View File

@ -48,10 +48,10 @@
<view class="sty-msg"> <!-- <view class="sty-msg">
<u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list"> <u-notice-bar :duration="5000" mode="horizontal" :is-circular="false" @click="goMsg" :list="list">
</u-notice-bar> </u-notice-bar>
</view> </view> -->
<view class="sty-statistics"> <view class="sty-statistics">
<u-row gutter="22" justify="space-between"> <u-row gutter="22" justify="space-between">
<u-col span="12" gutter="0"> <u-col span="12" gutter="0">

3
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventoryLogMapper.xml
Unescape View File

@ -33,6 +33,9 @@
<result column="storageAreaName" property="storageAreaName"/> <result column="storageAreaName" property="storageAreaName"/>
<result column="changeNumberSum" property="changeNumberSum"/> <result column="changeNumberSum" property="changeNumberSum"/>
<result column="inventoryNumberSum" property="inventoryNumberSum"/> <result column="inventoryNumberSum" property="inventoryNumberSum"/>
<result column="company_id" property="companyId"/>
<result column="department_id" property="departmentId"/>
<result column="organize_json_id" property="organizeJsonId"/>
</resultMap> </resultMap>
<select id="queryByKeyword" resultMap="getInventoryLogMap"> <select id="queryByKeyword" resultMap="getInventoryLogMap">
SELECT a.*, SELECT a.*,

3
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventoryMapper.xml
Unescape View File

@ -29,6 +29,9 @@
<result column="warehouseName" property="warehouseName"/> <result column="warehouseName" property="warehouseName"/>
<result column="storageAreaName" property="storageAreaName"/> <result column="storageAreaName" property="storageAreaName"/>
<result column="inventoryNumberSum" property="inventoryNumberSum"/> <result column="inventoryNumberSum" property="inventoryNumberSum"/>
<result column="company_id" property="companyId"/>
<result column="department_id" property="departmentId"/>
<result column="organize_json_id" property="organizeJsonId"/>
</resultMap> </resultMap>
<select id="queryByKeyword" resultMap="getInventoryMap"> <select id="queryByKeyword" resultMap="getInventoryMap">
SELECT a.*, SELECT a.*,

5
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/InventorySnapshotMapper.xml
Unescape View File

@ -45,6 +45,11 @@
<result column="alloteWarehousingNumberSum" property="alloteWarehousingNumberSum"/> <result column="alloteWarehousingNumberSum" property="alloteWarehousingNumberSum"/>
<result column="alloteOutboundNumberSum" property="alloteOutboundNumberSum"/> <result column="alloteOutboundNumberSum" property="alloteOutboundNumberSum"/>
<result column="otherNumberSum" property="otherNumberSum"/> <result column="otherNumberSum" property="otherNumberSum"/>
<result column="purchase_price" property="purchasePrice"/>
<result column="sale_price" property="salePrice"/>
<result column="company_id" property="companyId"/>
<result column="department_id" property="departmentId"/>
<result column="organize_json_id" property="organizeJsonId"/>
</resultMap> </resultMap>
<select id="queryByKeyword" resultMap="getInventorySnapshotMap"> <select id="queryByKeyword" resultMap="getInventorySnapshotMap">
SELECT a.*, SELECT a.*,

4
jnpf-java-boot/jnpf-scheduletask/jnpf-scheduletask-biz/src/main/java/jnpf/scheduletask/task/MyJobHandler.java
Unescape View File

@ -89,6 +89,8 @@ public class MyJobHandler {
inventorySnapshotEntity.setCode(inventoryEntity.getCode()); inventorySnapshotEntity.setCode(inventoryEntity.getCode());
inventorySnapshotEntity.setName(inventoryEntity.getName()); inventorySnapshotEntity.setName(inventoryEntity.getName());
inventorySnapshotEntity.setSpec(inventoryEntity.getSpec()); inventorySnapshotEntity.setSpec(inventoryEntity.getSpec());
inventorySnapshotEntity.setPurchasePrice(inventoryEntity.getPurchasePrice());
inventorySnapshotEntity.setSalePrice(inventoryEntity.getSalePrice());
//根据日期和批次号和商品id和快照类型查询前一日的数量 //根据日期和批次号和商品id和快照类型查询前一日的数量
InventorySnapshotEntity inventorySnapshotSearchEntity = new InventorySnapshotEntity(); InventorySnapshotEntity inventorySnapshotSearchEntity = new InventorySnapshotEntity();
inventorySnapshotSearchEntity.setBatchNumber(inventoryEntity.getBatchNumber()); inventorySnapshotSearchEntity.setBatchNumber(inventoryEntity.getBatchNumber());
@ -184,6 +186,8 @@ public class MyJobHandler {
inventorySnapshotEntity.setCode(inventoryEntity.getCode()); inventorySnapshotEntity.setCode(inventoryEntity.getCode());
inventorySnapshotEntity.setName(inventoryEntity.getName()); inventorySnapshotEntity.setName(inventoryEntity.getName());
inventorySnapshotEntity.setSpec(inventoryEntity.getSpec()); inventorySnapshotEntity.setSpec(inventoryEntity.getSpec());
inventorySnapshotEntity.setPurchasePrice(inventoryEntity.getPurchasePrice());
inventorySnapshotEntity.setSalePrice(inventoryEntity.getSalePrice());
//根据日期和批次号和商品id和快照类型查询前一月最后一天的数量 //根据日期和批次号和商品id和快照类型查询前一月最后一天的数量
InventorySnapshotEntity inventorySnapshotSearchEntity = new InventorySnapshotEntity(); InventorySnapshotEntity inventorySnapshotSearchEntity = new InventorySnapshotEntity();
inventorySnapshotSearchEntity.setBatchNumber(inventoryEntity.getBatchNumber()); inventorySnapshotSearchEntity.setBatchNumber(inventoryEntity.getBatchNumber());

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/InventorySnapshotEntity.java
Unescape View File

@ -127,4 +127,10 @@ public class InventorySnapshotEntity {
@TableField(exist = false) @TableField(exist = false)
private String dateBeforeString; private String dateBeforeString;
@TableField(value = "PURCHASE_PRICE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal purchasePrice;
@TableField(value = "SALE_PRICE" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal salePrice;
} }

Write Preview
Loading…
Cancel
Save