anthonywj
|
fce5d7b7c6
|
申购单据，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
wangwei
|
77256a1516
|
bug修改
|
2 years ago |
郑明梁
|
dcb4cad964
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4730d6fe78
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
054804cf7c
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
wangwei
|
628066d7c6
|
bug修改
|
2 years ago |
|
wangwei
|
b7ecf98f9e
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
wangwei
|
73057d3570
|
物资类别bug修改
|
2 years ago |
|
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
|
郑明梁
|
17a0e0b99c
|
Merge branch 'zmlDev' into dev
|
2 years ago |
|
郑明梁
|
2576df6d2b
|
Merge remote-tracking branch 'origin/zmlDev' into zmlDev
|
2 years ago |
|
郑明梁
|
31d1c52a30
|
单据上传功能代码提交
|
2 years ago |
|
wangwei
|
607414c4a1
|
物资类别bug修改
|
2 years ago |
|
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
|
anthonywj
|
a09eb7c2da
|
多级产品出库问题，申购新增备注字段搜索
|
2 years ago |
|
wangwei
|
5e3901e040
|
物资类别功能
|
2 years ago |
|
wangwei
|
60b96aaec6
|
带票出入库明细 增加查询条件等
|
2 years ago |
|
郑明梁
|
2127c2f170
|
物资类别功能代码初始化
|
2 years ago |
|
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
|
郑明梁
|
ce2aa13b5f
|
修改单据bug
|
2 years ago |
|
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
|
郑明梁
|
02a17df71a
|
多次出库bug修改
|
2 years ago |
|
郑明梁
|
d8fe73595b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
487473f91c
|
多次出库bug修改
|
2 years ago |
|
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
|
anthonywj
|
374f8261f8
|
相关bug修改
|
2 years ago |
|
wangwei
|
320b8f0487
|
单据排序
|
2 years ago |
|
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
|
wangwei
|
d4e0107b91
|
新增出入库 物资录入查询问题
|
2 years ago |
|
郑明梁
|
d1fe07356c
|
多次出入库代码提交
|
2 years ago |
|
wangwei
|
690d415779
|
新增申购 调整产品录入多选
|
2 years ago |
|
郑明梁
|
d1eb441bca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
90f1b6c334
|
产品名称转拼音首字母
|
2 years ago |
|
anthonywj
|
9249249182
|
申购产品生产企业对不上问题
|
2 years ago |
|
anthonywj
|
1a015238d6
|
采购计划提交系统繁忙问题，物资字典选入系统繁忙，生产企业查询系统繁忙
|
2 years ago |
|
anthonywj
|
d2cd3f803d
|
申购单据产品查询修改，提交采购订单修改
|
2 years ago |
|
wangwei
|
545905a5f3
|
新增申购产品录入多选问题
|
2 years ago |
|
anthonywj
|
bb43c32a1e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
d4119a70a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
66d890ab18
|
业务单据功能修改
|
2 years ago |
|
anthonywj
|
eb3f48ce04
|
代码合并
|
2 years ago |
1178634255
|
68586c23cb
|
上传设置备份
|
2 years ago |
|
anthonywj
|
70c0784584
|
申购，相关查询修改
|
2 years ago |
|
anthonywj
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
|
郑明梁
|
6b004099d3
|
业务单据功能优化
|
2 years ago |
|
wangwei
|
bd75cdeee8
|
修改bug
|
2 years ago |
|
郑明梁
|
673006306a
|
预验收库查询bug修复
|
2 years ago |
|
郑明梁
|
393172f736
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ba9711c467
|
库存预警bug修复
|
2 years ago |
|
wangwei
|
e0dc1d264c
|
库存预警信息 重置之后数据错误问题
|
2 years ago |
|
郑明梁
|
17a7d9859f
|
物资拜放bug修复
|
2 years ago |
|
郑明梁
|
4b4d6beb7a
|
第三方bug修改
|
2 years ago |
|
郑明梁
|
f81471d4e6
|
新增扫码单据排序
|
2 years ago |
|
郑明梁
|
847de9c01b
|
汇总代码提交
|
2 years ago |
|
郑明梁
|
269ddea831
|
物资查询按照isDisable字段查询
|
2 years ago |
|
郑明梁
|
8e35509a93
|
业务管理按时间排序
|
2 years ago |
|
anthonywj
|
0f93175ce0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
17827ab959
|
第三方产品信息接口新增厂家编码，供应商编码
|
2 years ago |
|
郑明梁
|
de32494a78
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e713e03a31
|
日和月统计代码提交
|
2 years ago |
|
anthonywj
|
3e53fea186
|
第三方接口下载bug修改
|
2 years ago |
|
anthonywj
|
f7d09c1ec4
|
第三方接口相关修改
|
2 years ago |
|
郑明梁
|
2d685b75d9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
4099c75d05
|
物资去掉放回id提交
|
2 years ago |
wj
|
21b81c5e40
|
bug修复
|
2 years ago |
|
wj
|
e3fdd85986
|
bug修复
|
2 years ago |
|
wj
|
1496bb4bda
|
bug修复--改方法名
|
2 years ago |
|
wj
|
1f3ba38e22
|
bug修复
|
2 years ago |
|
wj
|
8096c1933e
|
bug修复
|
2 years ago |
|
1178634255
|
46d5cb0181
|
内部码标签打印
|
2 years ago |
|
anthonywj
|
5619aa362c
|
代码备份
|
2 years ago |
schry
|
301e5812fa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
f0b8407c29
|
选入领用单据：“往来单位”查询框查询不到数据 230522
|
2 years ago |
|
郑明梁
|
4a6f792398
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
d0a507981f
|
物资新增多次出库设置
|
2 years ago |
|
schry
|
c669d89eb4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
68782d1619
|
业务单自动补单的单据类型名称不支持模糊查询 230519
|
2 years ago |
|
1178634255
|
e58e49b816
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
1178634255
|
9f1f491db3
|
修复入账库查询列表不会显示‘计量单位’,生产企业与单据类型的不一致
|
2 years ago |
|
郑明梁
|
d72625c5cd
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
|
郑明梁
|
7bbd253d1a
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
ee89548201
|
排序相关修改
|
2 years ago |
|
schry
|
f75b8fdd86
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
schry
|
a6a68cb35f
|
解决不显示计量单位
|
2 years ago |
|
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
|
anthonywj
|
f2968bf275
|
单据复制，单据流转带业务单信息，采购订单新增价格
|
2 years ago |
|
anthonywj
|
be6abd2063
|
bug修改
|
2 years ago |
|
郑明梁
|
32ff539034
|
多次使用出库设置功能代码提交
|
2 years ago |
|
anthonywj
|
85d73a0ee4
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
anthonywj
|
c3d9c20bc6
|
新增多次使用出库功能
|
2 years ago |
|
郑明梁
|
d24a412535
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
a1b4542df6
|
库存查询bug修改
|
2 years ago |
|
anthonywj
|
aaff1b1d7f
|
发票系统繁忙问题
|
2 years ago |
|
anthonywj
|
d166dd09d7
|
采购订单按供应商创建
|
2 years ago |
|
anthonywj
|
385b9075ac
|
bug修改
|
2 years ago |
|
郑明梁
|
92e2a0fe89
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
|
郑明梁
|
f22fc931f2
|
inv_user_product,inv_user_product_detail表初始化代码提交
|
2 years ago |
|
anthonywj
|
be5f16b38d
|
库存货位查询
|
2 years ago |
|
wangwei
|
a7f3caefe9
|
资质打印
|
2 years ago |
|
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
2 years ago |
|
郑明梁
|
400f32ac9b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
ffc363773e
|
单据打印修改
|
2 years ago |
|
wangwei
|
10ecccc021
|
如果角色存在用户关联 就不能是禁用状态
|
2 years ago |
|
郑明梁
|
1d6a2d78d7
|
业务单明细修改可看状态
|
2 years ago |
|
郑明梁
|
4472ad0490
|
库存查询新增货架查询
|
2 years ago |
|
wangwei
|
d83efd3e94
|
新增领用单 审核领用单 查询领用单 无法根据往来信息查询问题
|
2 years ago |
|
郑明梁
|
a198add3af
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
851232e270
|
库存查询新增货架查询
|
2 years ago |
|
anthonywj
|
0d3c032660
|
库存查询修改，内网单据确认同步到外网
|
2 years ago |
|
郑明梁
|
4ed43cda03
|
库存查询新增货架查询
|
2 years ago |
|
wangwei
|
d55358b8cd
|
修改查询发票方法
|
2 years ago |
|
anthonywj
|
8a8965e1e7
|
新增单据详情，发票、确认状态，同步更新，
|
2 years ago |
|
wangwei
|
36a62ff67b
|
修改查询发票方法
|
2 years ago |
|
wangwei
|
89e467a764
|
修改寄售 预验收库存查询
|
2 years ago |
|
anthonywj
|
23dacbc0d7
|
bug修改
|
2 years ago |
|
wangwei
|
972ed90e40
|
同步 优化发票代码
|
2 years ago |
|
wj
|
624aee5f1e
|
id映射问题
|
2 years ago |
|
wangwei
|
f45d18ec7f
|
同步发票代码
|
2 years ago |
|
郑明梁
|
e880330e7c
|
物质摆放功能代码提交
|
2 years ago |
|
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
2 years ago |
|
anthonywj
|
75077b05a4
|
同步相关问题修改。用户选入物资字典相关修改
|
2 years ago |
|
wangwei
|
94118141b5
|
发票修改
|
2 years ago |
|
anthonywj
|
a7ef10a6d7
|
寄售出库问题，预验收入库问题，同步问题，领用单据问题
|
2 years ago |
|
anthonywj
|
cc248bab94
|
上线bug修改，同步修改，发票修改
|
2 years ago |
|
anthonywj
|
f658c2c4c9
|
bug修改，上架摆货修改
|
2 years ago |
|
anthonywj
|
4b08aa2a4e
|
bug修改，上架摆货修改
|
2 years ago |
|
anthonywj
|
6322a3bd03
|
修改预验收，寄售其他仓库用户可查看，修复修改角色bug，修复按单摆货bug
|
2 years ago |
|
anthonywj
|
c6e36d0a79
|
数据同步下载问题
|
2 years ago |
|
anthonywj
|
3cae7526bc
|
摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货
|
2 years ago |
|
anthonywj
|
75d388e121
|
同步功能修改
|
2 years ago |
|
wj
|
872c4e5167
|
sql调整
|
2 years ago |
|
wj
|
6c44c6b690
|
sql调整
|
2 years ago |
|
郑明梁
|
0d878f1d64
|
修复id问题
|
2 years ago |
|
wangwei
|
dbaa3cf85e
|
修改 维护往来id问题
|
2 years ago |
|
郑明梁
|
ac199432c9
|
物资添加id问题
|
2 years ago |
|
anthonywj
|
a4838a4459
|
解决选入用户，移除用户系统繁忙问题
|
2 years ago |
|
anthonywj
|
0486af3461
|
Merge branch 'master' into test
|
2 years ago |
|
anthonywj
|
4687aeea24
|
预验收按货位退货
|
2 years ago |
|
wangwei
|
dbbcd67347
|
修改id问题
|
2 years ago |
|
anthonywj
|
14e43730de
|
ID相关修改
|
2 years ago |
|
anthonywj
|
3360b7e2bd
|
bug修改代码备份
|
2 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码，添加上架记录
|
2 years ago |
|
anthonywj
|
37af4d2462
|
合并同步 分支
|
2 years ago |
|
anthonywj
|
e62c88dfbe
|
合并git 分支
|
2 years ago |
|
anthonywj
|
73d6187176
|
合并master分支
|
2 years ago |
|
郑明梁
|
2e36abdc60
|
修改单据bug
|
2 years ago |
|
wangwei
|
23d1193b56
|
修改业务管理 模块中无法根据紧急成都查询
|
2 years ago |
|
wj
|
19d156e2c4
|
Merge remote-tracking branch 'origin/generId' into generId
# Conflicts:
# src/main/java/com/glxp/api/dao/auth/InvSpaceDao.java
# src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java
# src/main/resources/mybatis/mapper/auth/InvSpaceDao.xml
|
2 years ago |
|
wj
|
0499617822
|
系统设置同步
|
2 years ago |
|
anthonywj
|
4ea1efaa92
|
同步数据bug相关修复
|
2 years ago |
|
wangwei
|
cfe0153f1b
|
修改 用户管理,编辑时候,会把之前选入的部门替换掉
|
2 years ago |
|
wangwei
|
db2b9bcafe
|
修复单据查询bug
|
2 years ago |
|
x_z
|
00bd1ac2a4
|
1.调整摆放列表查询逻辑
|
2 years ago |
|
anthonywj
|
54dc7cd0eb
|
同步数据修改为雪花ID
|
2 years ago |
|
anthonywj
|
9e25fc5036
|
bug修改代码备份
|
2 years ago |
|
x_z
|
fc2ab43807
|
1.调整摆放功能代码
|
2 years ago |
|
anthonywj
|
1f6a08e74c
|
新增三期拣货，无三期拣货，为配货等页面
|
2 years ago |
|
x_z
|
18719072d6
|
1.调整盘点代码
|
2 years ago |
|
郑明梁
|
d6e68e11d2
|
出入库明细代码修改
|
2 years ago |
|
郑明梁
|
ca4e1757a9
|
库存产品拉取报错没有指定表字段
|
2 years ago |
|
郑明梁
|
064e779747
|
业务代码修改提交
|
2 years ago |
|
郑明梁
|
cc7cde1e29
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
9676304a40
|
计划单据提交
|
2 years ago |
|
x_z
|
0eb427119c
|
1.调整添加货位逻辑
|
2 years ago |
|
wangwei
|
df4d51cbba
|
修改 部门 仓库问题
|
2 years ago |
|
anthonywj
|
4278cf047e
|
bug修改
|
2 years ago |
|
wangwei
|
0e502f8666
|
修改部门 仓库bug
|
2 years ago |
|
郑明梁
|
9cce01e788
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
郑明梁
|
0c7a738fb7
|
申购单据提交
|
2 years ago |
|
wj
|
1174147d7f
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
3f4c4511d6
|
第三方数据同步
|
2 years ago |
|
郑明梁
|
140403de6d
|
耗材领用单据提交
|
2 years ago |
|
wj
|
943c02af52
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
1517d71b78
|
用户数据同步
|
2 years ago |
|
anthonywj
|
9f65dda33c
|
物资分类带代码迁移
|
2 years ago |
|
anthonywj
|
1e82f37f7f
|
物资字典参数设置，单据类型修改
|
2 years ago |
|
x_z
|
f6ca9ee95b
|
1.初步完成第三方系统接口定时任务
|
2 years ago |
|
wangwei
|
1524185bc6
|
同步 内部码
|
2 years ago |
|
x_z
|
bbb845f1bc
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
x_z
|
02f1ce16c6
|
1.提交代码
|
2 years ago |
|
郑明梁
|
b0543b862a
|
资质代码同步
|
2 years ago |
|
anthonywj
|
bd7fd9691a
|
物资字典代码迁移，新增国家库同步到外网查询
|
2 years ago |
|
anthonywj
|
8a9607f690
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
anthonywj
|
d730b5c084
|
数据同步修改
|
2 years ago |
|
wangwei
|
a2944efa3e
|
修改bug
|
2 years ago |
|
anthonywj
|
ec9c295e03
|
单据库存相关代码迁移
|
2 years ago |
|
x_z
|
9cc66f85da
|
1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
|
2 years ago |
|
anthonywj
|
a8504f276e
|
代码迁移备份，预验收退回修改
|
2 years ago |
|
x_z
|
faf499a4c6
|
1.合并第三方接口请求
|
2 years ago |
|
wangwei
|
c965db25d9
|
同步 部门信息 仓库信息 用户关系 角色管理
|
2 years ago |
|
郑明梁
|
57898a6731
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
# src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java
# src/main/java/com/glxp/api/task/AsyncUdiTask.java
# src/main/resources/schemas/schema_v2.1.sql
|
2 years ago |
|
郑明梁
|
35704f2221
|
单据类型设置代码提交(同步)
|
2 years ago |
|
x_z
|
e3c25b05b5
|
1.添加接口请求时间设置
|
2 years ago |
|
anthonywj
|
76994ae9f5
|
领用单据审核bug修改，自动生成业务单，扫码单等修改迁移
|
2 years ago |
|
anthonywj
|
e3c6399aa5
|
单据流转相关修改
|
2 years ago |
|
x_z
|
abbc13b2f5
|
1.合并自助平台库存预警设置的代码
|
2 years ago |
|
wj
|
d3e6df8623
|
bug修复
|
2 years ago |
