anthonywj
|
1b6eb549d8
|
设备管理相关代码整理
|
2 years ago |
|
anthonywj
|
af02503996
|
定量设置相关调整
|
2 years ago |
|
anthonywj
|
1c202156b4
|
价格相关修改，新增库存定量设置
|
2 years ago |
|
anthonywj
|
d9d4ca1771
|
新增价格相关处理
|
2 years ago |
|
anthonywj
|
1a30e1b923
|
手持终端下载供应商问题
|
2 years ago |
|
anthonywj
|
84feefd4c8
|
手持终端提交单据校验库存/物资字典对照问题
|
2 years ago |
|
anthonywj
|
c62383ff51
|
自定义头部参数代码备份
|
2 years ago |
|
anthonywj
|
4a8fb12b43
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
|
anthonywj
|
dec79c047d
|
新增已执行次数字段；
自定义前端表头字段相关操作类
|
2 years ago |
黄泽腾
|
3e43f5f1c4
|
设备管理-设备资质
|
2 years ago |
|
黄泽腾
|
ceb2ac74a8
|
设备管理-设备资质
|
2 years ago |
|
anthonywj
|
e16a34bc39
|
巡检计划定时任务补充（未完成）
|
2 years ago |
|
anthonywj
|
ba5731260b
|
设备管理设备位置字典表
|
2 years ago |
|
anthonywj
|
795cd78540
|
生产企业字典相关代码
|
2 years ago |
|
anthonywj
|
98951a39f0
|
设备使用记录相关操作类
|
2 years ago |
|
anthonywj
|
d31eee08c3
|
设备相关人员操作类
|
2 years ago |
|
anthonywj
|
14254daeb7
|
设备资质相关操作类
|
2 years ago |
郑明梁
|
5c5f667cf5
|
设备代码提交
|
2 years ago |
|
anthonywj
|
113457a42a
|
设备任务相互同步
|
2 years ago |
|
anthonywj
|
40f8701bc2
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
cc2cd0b511
|
新增同步操作日志相关方法
|
2 years ago |
|
anthonywj
|
c0a9d39535
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
|
anthonywj
|
8cf48f17d2
|
新增控制是否只校验批次号
|
2 years ago |
wangwei
|
6d8e7bdf87
|
报修详情接口
|
2 years ago |
|
郑明梁
|
f6f9b599a5
|
设备保修详情代码提交
|
2 years ago |
|
郑明梁
|
32c2798027
|
设备巡检任务代码提交
|
2 years ago |
|
anthonywj
|
d086c63ab2
|
根据全局设置项，不校验生产日期和失效日期
|
2 years ago |
|
郑明梁
|
6c66ec37ca
|
设备代码提交
|
2 years ago |
|
wangwei
|
b27758f8db
|
报修单 维保设备清单
|
2 years ago |
|
黄泽腾
|
f69b85697c
|
物资资质新增--新增配送产品资质信息
|
2 years ago |
|
wangwei
|
3585dde191
|
新增领用过滤零库存和负库存 保存时判断库存
|
2 years ago |
|
anthonywj
|
d9371c48f5
|
新增设备管理相关实体类与字段
|
2 years ago |
|
anthonywj
|
1846ce85dc
|
发票相关以orderresult表为准
|
2 years ago |
|
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
|
郑明梁
|
3b0d22d0e0
|
单据bug修改
|
2 years ago |
|
郑明梁
|
cdce81ecb1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
eda6292cf0
|
库存明细打印
|
2 years ago |
薛宇
|
1995a0c9ec
|
建议在“同步设置”页面，添加扫码单据类型功能模块：新增一个 搜索框功能
|
2 years ago |
|
wangwei
|
16a7a61a73
|
发票打印
|
2 years ago |
|
黄泽腾
|
60952f6168
|
新增往来单位搜索备份
|
2 years ago |
|
黄泽腾
|
0dec5c2ed0
|
生成不了多级的内部码，会自动变成一级的内部码（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
|
薛宇
|
e7392620b6
|
单据类型未启用，仍然可以做单（片仔癀诊断和管理系统都有这个问题）
|
2 years ago |
|
anthonywj
|
30dcdfd553
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
40fe92d304
|
发票代码提交
|
2 years ago |
|
anthonywj
|
89732532fa
|
Merge branch 'dev_ywj' into dev
|
2 years ago |
|
郑明梁
|
e01ec88f65
|
内部码打印问题修复
|
2 years ago |
|
1178634255
|
de6f13ec27
|
修改密码代码备份
|
2 years ago |
|
anthonywj
|
8d377e8839
|
Merge branch 'dev' into dev_ywj
# Conflicts:
# src/main/java/com/glxp/api/constant/Constant.java
# src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java
# src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java
# src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java
# src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java
# src/main/java/com/glxp/api/service/sync/HeartService.java
# src/main/java/com/glxp/api/task/SyncHeartTask.java
# src/main/java/com/glxp/api/task/SyncThirdSysTask.java
# src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java
# src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
|
2 years ago |
|
郑明梁
|
883084f4c5
|
定数包代码提交
|
2 years ago |
|
anthonywj
|
2e7d4c0999
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application-dev.yml
|
2 years ago |
|
anthonywj
|
bec91b93ca
|
新增协调平台追溯查询
|
2 years ago |
wj
|
4da2b87169
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
wj
|
87ee0073c1
|
ReplaceBatch.java调整
|
2 years ago |
|
郑明梁
|
de55970ff8
|
定数包加工代码初始化
|
2 years ago |
|
郑明梁
|
3445442cbb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
dad49893d3
|
定数包设置代码提交
|
2 years ago |
|
anthonywj
|
0acfe9785f
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
dae7656fff
|
单据上传至第三方相关调整，bug修改调整
|
2 years ago |
|
anthonywj
|
3e28f48933
|
待校验，等相关修改，
|
2 years ago |
|
郑明梁
|
e3bb14f114
|
定数包实体初始化
|
2 years ago |
|
anthonywj
|
f66705d82b
|
采购计划，采购订单等相关修改
|
2 years ago |
|
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
|
郑明梁
|
47b1bd2cd4
|
单据上传功能代码提交
|
2 years ago |
|
郑明梁
|
4730d6fe78
|
单据上传功能代码提交
|
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 |
|
郑明梁
|
2127c2f170
|
物资类别功能代码初始化
|
2 years ago |
|
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
|
anthonywj
|
dd1f68f103
|
发票相关问题修改
|
2 years ago |
|
anthonywj
|
84b7aae6dc
|
发票修改同步
|
2 years ago |
|
郑明梁
|
02a17df71a
|
多次出库bug修改
|
2 years ago |
|
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
|
anthonywj
|
bb43c32a1e
|
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
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
|
郑明梁
|
ba9711c467
|
库存预警bug修复
|
2 years ago |
|
郑明梁
|
de32494a78
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
|
郑明梁
|
e713e03a31
|
日和月统计代码提交
|
2 years ago |
|
wj
|
6111d7c580
|
insertIgnoreBatch/replaceBatch改造
|
2 years ago |
|
wj
|
1496bb4bda
|
bug修复--改方法名
|
2 years ago |
|
wj
|
1f3ba38e22
|
bug修复
|
2 years ago |
|
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
|
郑明梁
|
32ff539034
|
多次使用出库设置功能代码提交
|
2 years ago |
|
anthonywj
|
c3d9c20bc6
|
新增多次使用出库功能
|
2 years ago |
|
郑明梁
|
75f346c7a7
|
用户库存代码提交
|
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 |
|
wangwei
|
a7f3caefe9
|
资质打印
|
2 years ago |
|
anthonywj
|
59a0078a84
|
新增按货位出库功能
|
2 years ago |
|
wangwei
|
10ecccc021
|
如果角色存在用户关联 就不能是禁用状态
|
2 years ago |
|
郑明梁
|
851232e270
|
库存查询新增货架查询
|
2 years ago |
|
郑明梁
|
4ed43cda03
|
库存查询新增货架查询
|
2 years ago |
|
anthonywj
|
8a8965e1e7
|
新增单据详情，发票、确认状态，同步更新，
|
2 years ago |
|
wangwei
|
972ed90e40
|
同步 优化发票代码
|
2 years ago |
|
wangwei
|
f45d18ec7f
|
同步发票代码
|
2 years ago |
|
wj
|
943cea1816
|
Merge branch 'master' into dev
|
2 years ago |
|
郑明梁
|
9ac295028b
|
物质摆放功能代码提交
|
2 years ago |
|
wj
|
102cf093c2
|
增加replace,replaceBatch,insertIgnore,insertIgnoreBatch
|
2 years ago |
|
wangwei
|
94118141b5
|
发票修改
|
2 years ago |
|
anthonywj
|
cc248bab94
|
上线bug修改，同步修改，发票修改
|
2 years ago |
|
anthonywj
|
f658c2c4c9
|
bug修改，上架摆货修改
|
2 years ago |
|
anthonywj
|
6322a3bd03
|
修改预验收，寄售其他仓库用户可查看，修复修改角色bug，修复按单摆货bug
|
2 years ago |
|
anthonywj
|
3cae7526bc
|
摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货
|
2 years ago |
|
anthonywj
|
75d388e121
|
同步功能修改
|
2 years ago |
|
anthonywj
|
222c5f2708
|
解决选入用户，移除用户系统繁忙问题
|
2 years ago |
|
anthonywj
|
14e43730de
|
ID相关修改
|
2 years ago |
x_z
|
90340e2607
|
1.调整摆放功能代码，添加上架记录
|
2 years ago |
|
wj
|
c0aa3f4107
|
下载记录文件
|
2 years ago |
|
anthonywj
|
37af4d2462
|
合并同步 分支
|
2 years ago |
|
anthonywj
|
e62c88dfbe
|
合并git 分支
|
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 |
|
anthonywj
|
54dc7cd0eb
|
同步数据修改为雪花ID
|
2 years ago |
|
x_z
|
fc2ab43807
|
1.调整摆放功能代码
|
2 years ago |
|
anthonywj
|
1f6a08e74c
|
新增三期拣货，无三期拣货，为配货等页面
|
2 years ago |
|
x_z
|
18719072d6
|
1.调整盘点代码
|
2 years ago |
|
x_z
|
0eb427119c
|
1.调整添加货位逻辑
|
2 years ago |
|
wj
|
3f4c4511d6
|
第三方数据同步
|
2 years ago |
|
wj
|
943c02af52
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
1517d71b78
|
用户数据同步
|
2 years ago |
|
anthonywj
|
9f65dda33c
|
物资分类带代码迁移
|
2 years ago |
|
wj
|
a57b6a23a4
|
存储单据类型
|
2 years ago |
|
anthonywj
|
1e82f37f7f
|
物资字典参数设置，单据类型修改
|
2 years ago |
|
wj
|
6c13eb05d4
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
cdfda6af2a
|
由内向外同步
|
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
|
ec9c295e03
|
单据库存相关代码迁移
|
2 years ago |
|
x_z
|
9cc66f85da
|
1.添加第三方产品数据导入接口和逻辑
2.完善下载第三方系统数据逻辑
|
2 years ago |
|
anthonywj
|
a8504f276e
|
代码迁移备份，预验收退回修改
|
2 years ago |
|
x_z
|
faf499a4c6
|
1.合并第三方接口请求
|
2 years ago |
|
wj
|
f544f22cc9
|
Merge remote-tracking branch 'origin/master'
|
2 years ago |
|
wj
|
dea175b4d7
|
下载同步数据--其他数据
|
2 years ago |
|
wangwei
|
c965db25d9
|
同步 部门信息 仓库信息 用户关系 角色管理
|
2 years ago |
|
anthonywj
|
76994ae9f5
|
领用单据审核bug修改，自动生成业务单，扫码单等修改迁移
|
2 years ago |
|
anthonywj
|
e3c6399aa5
|
单据流转相关修改
|
2 years ago |
