anthonywj
|
24cd753745
|
设备明细表字段补充
|
2 years ago |
黄泽腾
|
ceb2ac74a8
|
设备管理-设备资质
|
2 years ago |
anthonywj
|
a77d2ca199
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
anthonywj
|
e16a34bc39
|
巡检计划定时任务补充(未完成)
|
2 years ago |
郑明梁
|
48431be244
|
设备领用审核代码提交
|
2 years ago |
anthonywj
|
ba5731260b
|
设备管理设备位置字典表
|
2 years ago |
anthonywj
|
795cd78540
|
生产企业字典相关代码
|
2 years ago |
anthonywj
|
98951a39f0
|
设备使用记录相关操作类
|
2 years ago |
anthonywj
|
024431999a
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
anthonywj
|
d31eee08c3
|
设备相关人员操作类
|
2 years ago |
郑明梁
|
671131105a
|
设备领用代码提交
|
2 years ago |
anthonywj
|
14254daeb7
|
设备资质相关操作类
|
2 years ago |
郑明梁
|
5c5f667cf5
|
设备代码提交
|
2 years ago |
anthonywj
|
1931ece8a3
|
修改设备任务ID为雪花ID(自增同步会有问题)
|
2 years ago |
anthonywj
|
d28b4f1699
|
同步任务备份
|
2 years ago |
郑明梁
|
a7725c066c
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
郑明梁
|
1b271cab9d
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
anthonywj
|
2ac43431a4
|
第三方业务单据下载重复问题
|
2 years ago |
wangwei
|
b400a08d83
|
同步删除基础数据
|
2 years ago |
anthonywj
|
df219f13c4
|
切换分支代码备份
|
2 years ago |
anthonywj
|
4eb14efc5f
|
手持终端获取单据类型
|
2 years ago |
郑明梁
|
e3dae86c72
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
郑明梁
|
a268df2cdb
|
设备bug修改提交
|
2 years ago |
郑明梁
|
1514065484
|
库存代码提交
|
2 years ago |
anthonywj
|
40f8701bc2
|
新增同步操作日志相关方法
|
2 years ago |
anthonywj
|
cc2cd0b511
|
新增同步操作日志相关方法
|
2 years ago |
anthonywj
|
13ada50cc3
|
Merge branch 'dev' into ywj_dev
# Conflicts:
# src/main/resources/application-dev.yml
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
wangwei
|
c959fc118d
|
报修详情接口
|
2 years ago |
郑明梁
|
8be3506529
|
设备巡检任务新增任务级别和保修类型字段
|
2 years ago |
郑明梁
|
f6f9b599a5
|
设备保修详情代码提交
|
2 years ago |
郑明梁
|
32c2798027
|
设备巡检任务代码提交
|
2 years ago |
anthonywj
|
5d8e8861b9
|
Merge branch 'dev' into ywj_dev
# Conflicts:
# src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
# src/main/resources/application-dev.yml
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
wangwei
|
1a87f29e4d
|
我的巡检任务
|
2 years ago |
anthonywj
|
8e102c1659
|
第三方产品信息异常问题(回滚)
|
2 years ago |
郑明梁
|
6c66ec37ca
|
设备代码提交
|
2 years ago |
anthonywj
|
5a22d137d8
|
预验收选入时增加过滤条件
|
2 years ago |
wangwei
|
b27758f8db
|
报修单 维保设备清单
|
2 years ago |
anthonywj
|
1476a0f894
|
新增websocket通信(中继服务同步相关)
|
2 years ago |
anthonywj
|
d9371c48f5
|
新增设备管理相关实体类与字段
|
2 years ago |
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
anthonywj
|
c5f47f8139
|
bug修改,新增单据验收补单校验
|
2 years ago |
郑明梁
|
80c5d58787
|
单据上传(回传自助单据号)
|
2 years ago |
anthonywj
|
9afe11946b
|
批次号为空时插入库存出现空字符串
|
2 years ago |
黄泽腾
|
0dec5c2ed0
|
生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题)
|
2 years ago |
wangwei
|
596a46130e
|
去除废弃字段
|
2 years ago |
anthonywj
|
4f25b9ee57
|
新增备注字段查询时查备注或病人信息
|
2 years ago |
anthonywj
|
d53c9e87ab
|
新增第三方单据自动下载与配置,日志生成等
|
2 years ago |
anthonywj
|
89732532fa
|
Merge branch 'dev_ywj' into dev
|
2 years ago |
郑明梁
|
98c0d2c69f
|
去除临时表的没有用的字段
|
2 years ago |
1178634255
|
999430aa52
|
新增往来类型为客户的医疗机构,新增出库单不会显示该信息
|
2 years ago |
郑明梁
|
dbbf5a8811
|
定数包去掉无用代码
|
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 |
郑明梁
|
b1fc3a50ef
|
修改bug
|
2 years ago |
郑明梁
|
883084f4c5
|
定数包代码提交
|
2 years ago |
郑明梁
|
de55970ff8
|
定数包加工代码初始化
|
2 years ago |
郑明梁
|
dad49893d3
|
定数包设置代码提交
|
2 years ago |
anthonywj
|
b3b935c0fe
|
根据单据类型查询问题
|
2 years ago |
anthonywj
|
ce801cd27c
|
单据带校验比对逻辑修改
|
2 years ago |
郑明梁
|
29df3286de
|
申购单流转价格问题修复
|
2 years ago |
anthonywj
|
ae4ff7d291
|
单据校验备份
|
2 years ago |
郑明梁
|
c50bd49100
|
多次出库bug修复
|
2 years ago |
郑明梁
|
e3bb14f114
|
定数包实体初始化
|
2 years ago |
anthonywj
|
f66705d82b
|
采购计划,采购订单等相关修改
|
2 years ago |
anthonywj
|
950301315d
|
更新审核人,核对人,供应商编辑信息bug
|
2 years ago |
anthonywj
|
86f084836e
|
选入第三方业务单据修改
|
2 years ago |
wangwei
|
77256a1516
|
bug修改
|
2 years ago |
anthonywj
|
5c0a78e70c
|
基础信息相关修改
|
2 years ago |
郑明梁
|
c5b7ba7db5
|
客户管理功能代码提交
|
2 years ago |
郑明梁
|
2127c2f170
|
物资类别功能代码初始化
|
2 years ago |
郑明梁
|
11be2ef830
|
修改货位上架按当前仓库筛选,和汇总导出加上仓库字段
|
2 years ago |
wangwei
|
68fd6641ba
|
同步代码 发票优化
|
2 years ago |
郑明梁
|
bfbb85eb57
|
统计汇总代码提交
|
2 years ago |
wangwei
|
690d415779
|
新增申购 调整产品录入多选
|
2 years ago |
郑明梁
|
d61ee07461
|
业务单据修改产品id类型(long)
|
2 years ago |
郑明梁
|
d1eb441bca
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
90f1b6c334
|
产品名称转拼音首字母
|
2 years ago |
wangwei
|
545905a5f3
|
新增申购产品录入多选问题
|
2 years ago |
anthonywj
|
bb43c32a1e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
d3697401a2
|
单据上传重盖
|
2 years ago |
郑明梁
|
46a981040a
|
业务单据功能修改
|
2 years ago |
anthonywj
|
eb3f48ce04
|
代码合并
|
2 years ago |
1178634255
|
f0cd926013
|
上传设置备份
|
2 years ago |
anthonywj
|
f51054ea40
|
第三方单据上传类型修改
|
2 years ago |
郑明梁
|
6b004099d3
|
业务单据功能优化
|
2 years ago |
郑明梁
|
17a7d9859f
|
物资拜放bug修复
|
2 years ago |
郑明梁
|
4b4d6beb7a
|
第三方bug修改
|
2 years ago |
郑明梁
|
f81471d4e6
|
新增扫码单据排序
|
2 years ago |
郑明梁
|
847de9c01b
|
汇总代码提交
|
2 years ago |
1178634255
|
c5182c1965
|
修复查询采购计划删除报错
|
2 years ago |
wj
|
ab780d007f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
wj
|
dc0a842edf
|
ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码]
|
2 years ago |
郑明梁
|
4a6f792398
|
多次使用出库新增功能代码提交
|
2 years ago |
郑明梁
|
d0a507981f
|
物资新增多次出库设置
|
2 years ago |
郑明梁
|
d72625c5cd
|
Merge remote-tracking branch 'origin/zmlDev' into dev
|
2 years ago |
郑明梁
|
3a26eafb7d
|
多次使用出库新增功能代码提交
|
2 years ago |
郑明梁
|
14c4bd0248
|
多次使用出库新增功能代码提交
|
2 years ago |
anthonywj
|
f2968bf275
|
单据复制,单据流转带业务单信息,采购订单新增价格
|
2 years ago |
wj
|
4ef46ec1b0
|
增加表名
|
2 years ago |
anthonywj
|
c3d9c20bc6
|
新增多次使用出库功能
|
2 years ago |
wangwei
|
4b917f22fd
|
冷链报告
|
2 years ago |