 sxu
|
962546f33f
|
for test
|
2024-07-19 09:34:00 +08:00 |
 15856
|
10e0169182
|
工地直转代码优化
|
2024-07-18 17:40:07 +08:00 |
|
15856
|
7b389d7632
|
优化sql语句，南网测试环境的mysql版本是5.7.21版本过低不支持递归函数
|
2024-07-18 14:27:01 +08:00 |
 mashuai
|
22965b6d73
|
bug修复
|
2024-07-18 11:11:10 +08:00 |
|
15856
|
032ca9a182
|
盘点入库问题修复
|
2024-07-16 14:27:45 +08:00 |
|
15856
|
7acb95c487
|
合并优化
|
2024-07-15 17:15:20 +08:00 |
|
15856
|
a8097987df
|
Merge remote-tracking branch 'origin/dev-nw' into dev-nwcc
# Conflicts:
# sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/model/LoginUser.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/utils/RsaUtil.java
# sgzb-common/sgzb-common-core/src/main/java/com/bonus/sgzb/common/core/constant/Constants.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
# sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/ParamsDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InventoryAndWarehousingController.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
# sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/config/RsaUtil.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysConfigController.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysProfileController.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/SysUserController.java
# sgzb-ui/package.json
# sgzb-ui/src/api/claimAndRefund/return.js
# sgzb-ui/src/router/index.js
# sgzb-ui/src/store/modules/user.js
# sgzb-ui/src/utils/globalUrl.js
# sgzb-ui/src/views/base/section/index.vue
# sgzb-ui/src/views/claimAndRefund/return/returnInDetail.vue
# sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
# sgzb-ui/src/views/index.vue
# sgzb-ui/src/views/oldLogin.vue
# sgzb-ui/src/views/resetPassword.vue
# sgzb-ui/src/views/system/config/index.vue
# sgzb-ui/src/views/system/user/index.vue
# sgzb-ui/src/views/warehouseManage/machinery/coding/index.vue
# sgzb-ui/src/views/warehouseManage/newPurchase/toolsAcceptance/component/queryTools.vue
# sgzb-ui/vue.config.js
|
2024-07-15 10:21:48 +08:00 |
|
mashuai
|
d293205c43
|
退料审核bug
|
2024-06-19 13:59:19 +08:00 |
|
mashuai
|
4186260ef5
|
退料审核bug
|
2024-06-19 13:55:58 +08:00 |
|
mashuai
|
43ca5391e7
|
退料审核bug
|
2024-06-18 17:38:08 +08:00 |
|
mashuai
|
e80849ec52
|
退料审核bug
|
2024-06-18 16:23:47 +08:00 |
 csyue
|
245c841248
|
重庆测试问题修改
|
2024-06-14 17:28:18 +08:00 |
 hayu
|
1fd3565c51
|
新购时间筛选修改
|
2024-06-14 15:14:34 +08:00 |
|
mashuai
|
9cd15963dd
|
bug
|
2024-06-14 14:58:11 +08:00 |
|
mashuai
|
3d6e880881
|
bug
|
2024-06-13 17:52:10 +08:00 |
|
mashuai
|
926c07a059
|
乱码bug
|
2024-06-13 14:44:15 +08:00 |
|
mashuai
|
f0157d9563
|
乱码bug
|
2024-06-13 14:42:47 +08:00 |
|
csyue
|
c0e7bf8d7c
|
Merge remote-tracking branch 'origin/dev-cq' into dev-cq
|
2024-06-12 17:44:16 +08:00 |
|
csyue
|
a159464dfc
|
领料审核增加任务状态筛选
|
2024-06-12 17:43:04 +08:00 |
|
mashuai
|
b19c374c54
|
入库盘点
|
2024-06-12 13:51:52 +08:00 |
|
mashuai
|
bfbb2bba31
|
入库盘点
|
2024-06-12 13:46:55 +08:00 |
|
csyue
|
b6a404753b
|
重庆新购无法绑定编码问题修改
|
2024-06-07 13:29:51 +08:00 |
|
mashuai
|
a5e306a0f9
|
盘点入库详情
|
2024-06-05 14:32:17 +08:00 |
|
mashuai
|
47831720ed
|
盘点入库详情
|
2024-06-05 14:06:45 +08:00 |
|
mashuai
|
a5f7806154
|
重庆用户加解密
|
2024-06-05 13:37:52 +08:00 |
|
赵福海
|
24b6c7be6e
|
bug修复
|
2024-06-04 15:41:08 +08:00 |
|
hayu
|
351bcbfb12
|
测试问题修改
|
2024-06-04 09:01:38 +08:00 |
|
赵福海
|
0000bf3752
|
Merge remote-tracking branch 'origin/dev' into dev-cq
# Conflicts:
# sgzb-auth/src/main/java/com/bonus/sgzb/auth/controller/TokenController.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SavePutInfoDto.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java
# sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java
# sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysSmsServiceImpl.java
# sgzb-ui/package.json
# sgzb-ui/prettier.config.js
# sgzb-ui/src/router/index.js
# sgzb-ui/src/utils/request.js
# sgzb-ui/src/views/base/comeAndGo/index.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue
# sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue
# sgzb-ui/src/views/login.vue
# sgzb-ui/src/views/repairTest/repair/dialogOneForm.vue
# sgzb-ui/src/views/store/newBuy/newDevices/newDevicesArrival.vue
# sgzb-ui/src/views/store/tools/keeper.vue
# sgzb-ui/src/views/system/user/index.vue
# sgzb-ui/vue.config.js
|
2024-05-31 15:19:38 +08:00 |
|
mashuai
|
affa4c62a4
|
盘点入库
|
2024-05-25 16:47:00 +08:00 |
|
mashuai
|
dd8e0e788a
|
盘点入库,用户加解密
|
2024-05-25 16:32:27 +08:00 |
|
mashuai
|
9c37c5d769
|
bug
|
2024-05-24 19:29:54 +08:00 |
|
mashuai
|
6ac2183854
|
bug
|
2024-05-24 15:16:52 +08:00 |
|
mashuai
|
eaecddaae6
|
nacos
|
2024-05-23 21:39:32 +08:00 |
|
mashuai
|
9d2d1bb152
|
用户加密漏洞
|
2024-05-23 19:48:15 +08:00 |
|
mashuai
|
007d8934e8
|
漏洞
|
2024-05-21 10:08:45 +08:00 |
BianLzhaoMin
|
f6c1bdb1c7
|
冲突合并
|
2024-05-07 16:38:53 +08:00 |
|
15856
|
d92af0df79
|
导出预报废审核列表
|
2024-05-07 11:02:36 +08:00 |
|
mashuai
|
0f3675df58
|
bug
|
2024-05-07 10:21:12 +08:00 |
|
15856
|
40736e1c85
|
催办，退料报废，维修报废，预报废审核，报废审核
|
2024-05-06 10:35:08 +08:00 |
|
15856
|
25f84100e6
|
bug修复
|
2024-04-30 14:32:17 +08:00 |
|
15856
|
bbf5d988f3
|
Merge remote-tracking branch 'origin/dev-cq-bug' into dev
|
2024-04-30 10:26:55 +08:00 |
liang.chao
|
763c003c34
|
新购验收查询接口添加
|
2024-04-30 09:09:34 +08:00 |
|
mashuai
|
88ac035ed7
|
bug
|
2024-04-29 18:43:22 +08:00 |
|
15856
|
bad5c11bdc
|
Merge remote-tracking branch 'origin/dev' into dev-cq-bug
|
2024-04-28 16:41:10 +08:00 |
|
15856
|
f5f2307232
|
Bug修复
|
2024-04-26 17:58:14 +08:00 |
|
liang.chao
|
86c204a632
|
字段别名添加
|
2024-04-26 17:52:15 +08:00 |
|
liang.chao
|
bf0992137d
|
成套机具和退料申请当前在用量代码提交
|
2024-04-26 17:00:29 +08:00 |
|
15856
|
14822542ce
|
Bug修复
|
2024-04-25 16:43:56 +08:00 |
|
mashuai
|
0e681358a9
|
bug
|
2024-04-25 15:52:01 +08:00 |
|
liang.chao
|
82e8a6db4a
|
退料审核代码提交
|
2024-04-24 14:05:18 +08:00 |