anthonywj
|
f6ecc65386
|
患者处方相关修改优化
|
2 years ago |
anthonywj
|
d345794cdb
|
患者处方相关修改
|
2 years ago |
anthonywj
|
270410daea
|
s设备标签打印问题
|
2 years ago |
anthonywj
|
c73e2bf1f2
|
第三方接口修改,第三接口容错处理,患者信息相关修改,单据类型患者相关修改,临床出库患者信息选择,是否对照处方等相关配置
|
2 years ago |
anthonywj
|
5f110bea39
|
患者处方相关修改
|
2 years ago |
wj
|
1df50657b0
|
设备相关
|
2 years ago |
yuanwei
|
b5108288a5
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
yuanwei
|
e8a0c53057
|
集成动态表单
|
2 years ago |
anthonywj
|
be1475a5da
|
新增库存出库模式,总库库存,上级库存,当前库存
|
2 years ago |
yuanwei
|
ba23b3e90e
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
yuanwei
|
b382a19fc4
|
出入库单管理配置
|
2 years ago |
anthonywj
|
6d0090c058
|
长泰新增配送产品,物资分类问题
|
2 years ago |
yuanwei
|
508e93bb91
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
yuanwei
|
9b4ac353f7
|
单据管理
|
2 years ago |
anthonywj
|
f79458bb45
|
长泰新增配送产品,物资分类问题
|
2 years ago |
anthonywj
|
e7cdbf7140
|
第三方产品信息上传
|
2 years ago |
anthonywj
|
9dba332648
|
切换分支备份
|
2 years ago |
yuanwei
|
6502b3a7a7
|
出入库单管理配置
|
2 years ago |
yuanwei
|
0d2eb0d69c
|
计划管理配置
|
2 years ago |
yuanwei
|
a257c8a3a7
|
申购管理配置
|
2 years ago |
yuanwei
|
600a688072
|
Merge remote-tracking branch 'origin/dev_price' into 20231126-yw
|
2 years ago |
yuanwei
|
9112dbdf08
|
领用管理提交
|
2 years ago |
yuanwei
|
31144b596b
|
字典功能处理
|
2 years ago |
anthonywj
|
426b966cb3
|
合并分支备份
|
2 years ago |
yuanwei
|
1eab520dfd
|
初始化动态配置
|
2 years ago |
anthonywj
|
399d6c3881
|
出入库明细单据类型
|
2 years ago |
anthonywj
|
677f368635
|
退货补单,多级仓库补单修改,新增灭菌批号,灭菌日期
|
2 years ago |
anthonywj
|
f839f4633d
|
单据打印,库存查询修改
|
2 years ago |
anthonywj
|
32bd31903d
|
每日汇总统计等
|
2 years ago |
anthonywj
|
4d307a42a3
|
单据按di排序
|
2 years ago |
anthonywj
|
7de61eb509
|
预验收入库单区分带回与不带回
|
2 years ago |
anthonywj
|
a277bc0ba2
|
项目组套相关更新
|
2 years ago |
anthonywj
|
15e7286003
|
患者信息,处方信息下载
|
2 years ago |
anthonywj
|
5085b66a7f
|
新增物价类别
|
2 years ago |
anthonywj
|
d7109caf5a
|
物资分类添加仓库与部门
|
2 years ago |
anthonywj
|
f23c0136dd
|
新增退货补单流程,诏安两个分库问题,单据明细打印问题
|
2 years ago |
anthonywj
|
6f43a8a666
|
库存添加过滤条件,领用单据流转生成出入库单据,DI查询库存
|
2 years ago |
anthonywj
|
6d5e0228d9
|
单据复制校验库存,申购加到货仓库
|
2 years ago |
anthonywj
|
30813b31bd
|
新增库存过滤方式,新增内网版本更新
|
2 years ago |
anthonywj
|
ed4dc216bb
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
anthonywj
|
cd25fab565
|
UDI物资流向查询未查询到数据问题
|
2 years ago |
wj
|
b34ad7e181
|
调整
|
2 years ago |
wj
|
098280532f
|
Merge remote-tracking branch 'origin/dev_price' into dev_price
|
2 years ago |
wj
|
41babe7e64
|
库存对比相关--未完结
|
2 years ago |
anthonywj
|
b1ece4dbc6
|
申购添加商品名称等字段
|
2 years ago |
anthonywj
|
e192f70aba
|
患者信息,患者处方等相关接口新增
|
2 years ago |
anthonywj
|
c20dcbd4a5
|
患者信息,患者处方等相关接口新增
|
2 years ago |
anthonywj
|
bbc21a1a97
|
udi追溯查询
|
2 years ago |
anthonywj
|
4b0d54ba71
|
添加患者相关操作类,打印问题修改,项目、定数包相关修改
|
2 years ago |
anthonywj
|
00c2995717
|
预验收库存,领用等修改
|
2 years ago |
anthonywj
|
a038cac875
|
领用相关问题修改
|
2 years ago |
anthonywj
|
4f35b8365f
|
库存仓库领用等修改
|
2 years ago |
anthonywj
|
2eb50644dc
|
领用预验收库存不足,领用相关问题修改
|
2 years ago |
anthonywj
|
974f1aca65
|
第三方服务修改
|
2 years ago |
anthonywj
|
2702e27fa0
|
价格问题
|
2 years ago |
anthonywj
|
fd31e5a224
|
平潭普耗相关修改,汇总统计修改
|
2 years ago |
anthonywj
|
70323f2e5f
|
领用获取上级仓库
|
2 years ago |
anthonywj
|
4631e2dfcc
|
PDA首页菜单问题
|
2 years ago |
wj
|
feccc47758
|
调整
|
2 years ago |
anthonywj
|
94e09d6d8d
|
盘点相关功能--盘点方式,部分盘点修改
|
2 years ago |
anthonywj
|
0074c56c9d
|
盘点相关功能
|
2 years ago |
anthonywj
|
b626d39d0d
|
盘点接口相关调整
|
2 years ago |
anthonywj
|
1b3c16482a
|
移除盘点相关功能
|
2 years ago |
anthonywj
|
1b6eb549d8
|
设备管理相关代码整理
|
2 years ago |
anthonywj
|
16e5b8de59
|
耗材字典多个DI问题
|
2 years ago |
anthonywj
|
12f1851bba
|
业务单据打印等,出入库明细打印等
|
2 years ago |
anthonywj
|
8677fb7fdc
|
业务单据打印相关
|
2 years ago |
anthonywj
|
ac4774981d
|
定量设置相关修改
|
2 years ago |
anthonywj
|
7a1f295fa7
|
单据审核相关修改
|
2 years ago |
anthonywj
|
ea411c4102
|
价格单据审核相关修改
|
2 years ago |
anthonywj
|
c91f10609f
|
价格校验备份
|
2 years ago |
anthonywj
|
21a94967d8
|
业务单直接生成扫码单
|
2 years ago |
anthonywj
|
1c202156b4
|
价格相关修改,新增库存定量设置
|
2 years ago |
anthonywj
|
d9d4ca1771
|
新增价格相关处理
|
2 years ago |
anthonywj
|
a7c709c2e7
|
手持终端登录,审核等问题修改
|
2 years ago |
anthonywj
|
5f3aca56b2
|
超时修改密码
|
2 years ago |
anthonywj
|
1a30e1b923
|
手持终端下载供应商问题
|
2 years ago |
anthonywj
|
dbd58892ee
|
单据类型初始化问题
|
2 years ago |
anthonywj
|
54c7b550a2
|
单据类型添加编辑类型
|
2 years ago |
anthonywj
|
b4205b7cf3
|
系统升级bug修改
|
2 years ago |
anthonywj
|
2806032885
|
系统升级bug修改
|
2 years ago |
anthonywj
|
50456615ab
|
预验收退库修改
|
2 years ago |
anthonywj
|
b4fdb1a165
|
替换 BeanUtil.copyProperties
|
2 years ago |
anthonywj
|
e854b3c5b3
|
单据验收加日志查看
|
2 years ago |
anthonywj
|
3847e021b2
|
登录菜单问题
|
2 years ago |
anthonywj
|
23bbe2166c
|
pda单据复制问题
|
2 years ago |
anthonywj
|
b16422ae15
|
手持终端单据验收问题
|
2 years ago |
anthonywj
|
84feefd4c8
|
手持终端提交单据校验库存/物资字典对照问题
|
2 years ago |
anthonywj
|
490df6ea57
|
s手持终端库存校验问题
|
2 years ago |
anthonywj
|
d160138cb7
|
切换分支备份
|
2 years ago |
anthonywj
|
d8a88547fe
|
pda带配/拣货单据修改
|
2 years ago |
郑明梁
|
06ebf55ed0
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/resources/schemas/schema_v2.2.sql
|
2 years ago |
郑明梁
|
af21cfdf13
|
设备代码提交
|
2 years ago |
anthonywj
|
90f7f1f927
|
PDA手持终端相关接口
|
2 years ago |
郑明梁
|
20b6055f1b
|
设备代码提交
|
2 years ago |
黄泽腾
|
e699316e91
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
黄泽腾
|
a3cb6e57e1
|
设备管理-技术资料
|
2 years ago |
anthonywj
|
c62383ff51
|
自定义头部参数代码备份
|
2 years ago |
郑明梁
|
70483edee8
|
设备代码提交
|
2 years ago |
黄泽腾
|
3e43f5f1c4
|
设备管理-设备资质
|
2 years ago |
anthonywj
|
24cd753745
|
设备明细表字段补充
|
2 years ago |
郑明梁
|
fe1f7e92e6
|
设备领用查看代码提交
|
2 years ago |
黄泽腾
|
ceb2ac74a8
|
设备管理-设备资质
|
2 years ago |
anthonywj
|
ba5731260b
|
设备管理设备位置字典表
|
2 years ago |
anthonywj
|
795cd78540
|
生产企业字典相关代码
|
2 years ago |
anthonywj
|
024431999a
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
anthonywj
|
d31eee08c3
|
设备相关人员操作类
|
2 years ago |
郑明梁
|
8375447cc4
|
设备领用代码提交
|
2 years ago |
anthonywj
|
14254daeb7
|
设备资质相关操作类
|
2 years ago |
anthonywj
|
4d6f807791
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
anthonywj
|
cdffd6e6f8
|
更换BeanUtils.copyProperties
|
2 years ago |
黄泽腾
|
ce3ceeeff7
|
新增申购单点击产品录入时显示系统繁忙
|
2 years ago |
郑明梁
|
5c5f667cf5
|
设备代码提交
|
2 years ago |
anthonywj
|
319484c145
|
1:手持终端相关接口补充
2:待校验以校验结果提交,未生成单据详情问题
|
2 years ago |
黄泽腾
|
1161499ed4
|
往来单位信息备份
|
2 years ago |
郑明梁
|
b853ee66a5
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
郑明梁
|
eec65dea6c
|
设备bug修复
|
2 years ago |
anthonywj
|
66efd57b70
|
设备任务相互同步
|
2 years ago |
anthonywj
|
113457a42a
|
设备任务相互同步
|
2 years ago |
anthonywj
|
c3a8c5da54
|
删除任务同步相关调整(后续还需调整)
|
2 years ago |
anthonywj
|
1931ece8a3
|
修改设备任务ID为雪花ID(自增同步会有问题)
|
2 years ago |
anthonywj
|
d28b4f1699
|
同步任务备份
|
2 years ago |
郑明梁
|
a50fc4f2fb
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
郑明梁
|
025d2d4b67
|
设备任务同步到自助
|
2 years ago |
wangwei
|
89e11d3572
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
wangwei
|
836343539f
|
修改新增送货单 录入产品 指定备案号选入后出现多条问题
|
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 |
郑明梁
|
6f83935215
|
采购订单供应商字段为空问题修复
|
2 years ago |
wangwei
|
838789986a
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
wangwei
|
b400a08d83
|
同步删除基础数据
|
2 years ago |
郑明梁
|
14dc22481b
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
郑明梁
|
2771e60a67
|
设备bug修改提交
|
2 years ago |
anthonywj
|
4eb14efc5f
|
手持终端获取单据类型
|
2 years ago |
黄泽腾
|
9dd61ba841
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
# src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
# src/main/resources/application-dev.yml
|
2 years ago |
黄泽腾
|
55c2c3233d
|
中医院往来信息单位显示
|
2 years ago |
郑明梁
|
e3dae86c72
|
Merge remote-tracking branch 'origin/dev' into dev2.0
|
2 years ago |
郑明梁
|
a268df2cdb
|
设备bug修改提交
|
2 years ago |
anthonywj
|
1409fdc451
|
接口地址重复
|
2 years ago |
anthonywj
|
249edf57b8
|
Merge remote-tracking branch 'origin/dev2.0' into dev2.0
|
2 years ago |
anthonywj
|
422f9e788c
|
新增单据核对接口
|
2 years ago |
郑明梁
|
60f9a148de
|
领用代码提交
|
2 years ago |
黄泽腾
|
0d85313688
|
Merge branch 'dev' into dev2.0
|
2 years ago |
anthonywj
|
a6436a4642
|
pda待校验待配货等单据下载接口
|
2 years ago |
薛宇
|
384a0f54cc
|
领用仓库选择二级仓库的话,可以领用上一级中心库的产品
|
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 |
郑明梁
|
e5d28786dd
|
设备报修代码提交
|
2 years ago |
wangwei
|
cffb595319
|
报修详情接口
|
2 years ago |
wangwei
|
c959fc118d
|
报修详情接口
|
2 years ago |
wangwei
|
21294acab7
|
详情接口
|
2 years ago |
wangwei
|
6d8e7bdf87
|
报修详情接口
|
2 years ago |
郑明梁
|
d66303b2fb
|
设备巡检任务代码提交
|
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 |
郑明梁
|
6c66ec37ca
|
设备代码提交
|
2 years ago |
anthonywj
|
5a22d137d8
|
预验收选入时增加过滤条件
|
2 years ago |
wangwei
|
b27758f8db
|
报修单 维保设备清单
|
2 years ago |
黄泽腾
|
f69b85697c
|
物资资质新增--新增配送产品资质信息
|
2 years ago |
anthonywj
|
358081e37e
|
添加每日汇总测试接口
|
2 years ago |
anthonywj
|
3da6898176
|
自助平台确认状态同步问题
|
2 years ago |
wangwei
|
3585dde191
|
新增领用过滤零库存和负库存 保存时判断库存
|
2 years ago |
anthonywj
|
d9371c48f5
|
新增设备管理相关实体类与字段
|
2 years ago |
anthonywj
|
ddc5eab3cd
|
协调平台时间格式问题
|
2 years ago |
郑明梁
|
c39ffb1587
|
业务单缺失注册证号
|
2 years ago |
anthonywj
|
1846ce85dc
|
发票相关以orderresult表为准
|
2 years ago |
anthonywj
|
de7412b096
|
库存无批次号系统繁忙问题
|
2 years ago |
anthonywj
|
7fefd6dc24
|
追溯查询排序问题
|
2 years ago |
anthonywj
|
0b613af049
|
bug修改,物资字典boolean ->Boolean
|
2 years ago |
郑明梁
|
430d5b2604
|
打印修改
|
2 years ago |
wangwei
|
79fa22c142
|
修改复制生成单据 填写备注 生成之后备注为空 问题
|
2 years ago |
anthonywj
|
c5f47f8139
|
bug修改,新增单据验收补单校验
|
2 years ago |
郑明梁
|
3b0d22d0e0
|
单据bug修改
|
2 years ago |
郑明梁
|
49f578d505
|
加上规则注释
|
2 years ago |
郑明梁
|
ba0cfd96c9
|
维护出入库增加状态控制
|
2 years ago |
郑明梁
|
abc95ff8a4
|
模板增加字段
|
2 years ago |
郑明梁
|
c386367832
|
bug修复
|
2 years ago |
anthonywj
|
177c600112
|
代码备份
|
2 years ago |
郑明梁
|
75f4ff7d7a
|
单据打印增加自助单号字段
|
2 years ago |
郑明梁
|
6473840e17
|
申购单查询状态判断
|
2 years ago |
郑明梁
|
92f760d50b
|
明细打印
|
2 years ago |
黄泽腾
|
4ac8eb7c0e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
黄泽腾
|
55232a4b3f
|
无三期业务单配/拣货提交业务单时,会受到’有三期业务单配/拣货‘单据类型的影响
|
2 years ago |
wangwei
|
b44424d672
|
修改 采购订单 到货时间比单据创建时间早
|
2 years ago |
薛宇
|
de65f6237a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
薛宇
|
f3fb4e8552
|
物资过期处理方式无法弹框提醒
|
2 years ago |
郑明梁
|
cdce81ecb1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
eda6292cf0
|
库存明细打印
|
2 years ago |
薛宇
|
d95fa8811c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
薛宇
|
1995a0c9ec
|
建议在“同步设置”页面,添加扫码单据类型功能模块:新增一个 搜索框功能
|
2 years ago |
郑明梁
|
cece855d6b
|
三期出现重复序列号问题
|
2 years ago |
郑明梁
|
d9462d3f2e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
a37ae92711
|
采购订单取消供应商控制
|
2 years ago |
wangwei
|
c0229625f9
|
优化发票打印
|
2 years ago |
wangwei
|
16a7a61a73
|
发票打印
|
2 years ago |
黄泽腾
|
4d2d13932d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
黄泽腾
|
cddef69ce7
|
预警时间单位设置为“小时”,实际上单位还是“天”
|
2 years ago |
anthonywj
|
447526f19c
|
误删登记状态
|
2 years ago |
薛宇
|
e187c81b04
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
薛宇
|
ea026d8f26
|
业务单自动补单-出入库单设置时间间隔,时间没有推移
|
2 years ago |
郑明梁
|
a9f47f41b9
|
单据提交缺失备注字段
|
2 years ago |
wangwei
|
f98133e100
|
修改 用内部码进行调拨出库 提示库存不足问题
|
2 years ago |
黄泽腾
|
4fd3c726f0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
黄泽腾
|
60952f6168
|
新增往来单位搜索备份
|
2 years ago |
黄泽腾
|
4a81812f88
|
使用第三方产品编码生成的内部码无法在耗材字典查询
|
2 years ago |
薛宇
|
01293fe8ba
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
薛宇
|
0c7b4455c4
|
同步设置功能,同步至自助平台或管理系统的扫码单据只能单线选择
|
2 years ago |
anthonywj
|
ce5ff68e76
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
4f25b9ee57
|
新增备注字段查询时查备注或病人信息
|
2 years ago |
薛宇
|
2dfbef4154
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
薛宇
|
e7392620b6
|
单据类型未启用,仍然可以做单(片仔癀诊断和管理系统都有这个问题)
|
2 years ago |
黄泽腾
|
c1ec9cb262
|
供应商器械信息模块可以重复选入产品
|
2 years ago |
anthonywj
|
d53c9e87ab
|
新增第三方单据自动下载与配置,日志生成等
|
2 years ago |
anthonywj
|
660d748cfa
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
anthonywj
|
5810d14716
|
修改诊断现存量查询,库存实时查询
|
2 years ago |
wangwei
|
33cb628f22
|
物资类别 过滤停用产品
|
2 years ago |
郑明梁
|
01219e3f5b
|
单据查询问题修复(带校验)
|
2 years ago |
郑明梁
|
50edb4e747
|
单据查询问题修复(带校验)
|
2 years ago |
anthonywj
|
3d0dacb11c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
bc43d938b0
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
447e8f128c
|
多次出库bug修复
|
2 years ago |
薛宇
|
1737372abc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
薛宇
|
51fea370b1
|
领用仓库选择手术室的话,是可以领用上一级中心库的产品
|
2 years ago |
wangwei
|
4402220c6b
|
修改bug
|
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 |
anthonywj
|
0445657cf0
|
bug修改
|
2 years ago |
郑明梁
|
ec39ea48d1
|
修改往来单位查询问题
|
2 years ago |
anthonywj
|
658fb65413
|
委託驗收外網bug
|
2 years ago |
anthonywj
|
b7c6ef8cc7
|
委托验收不调拨入库问题
|
2 years ago |
anthonywj
|
f0788e4067
|
bug修改
|
2 years ago |
郑明梁
|
096f7cd13b
|
新增出入库单三期校验重复扫码问题修复
|
2 years ago |
schry
|
229c1bd241
|
进入“往来单位信息维护”,默认显示 供应商信息 ,选择“全部”查询也是显示供应商类型的往来单位信息
|
2 years ago |
1178634255
|
999430aa52
|
新增往来类型为客户的医疗机构,新增出库单不会显示该信息
|
2 years ago |
郑明梁
|
14c5e9a65c
|
选入di国家库查询
|
2 years ago |
郑明梁
|
4aaad76fe9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2 years ago |
郑明梁
|
edb42ada3d
|
修改自助单据审核问题
|
2 years ago |
wangwei
|
2738e58cbb
|
出入库补单 出入库单与目标出入库单相同给出提示
|
2 years ago |
1178634255
|
9b518e90a2
|
代码更新
|
2 years ago |
1178634255
|
c241831d6d
|
代码更新
|
2 years ago |
1178634255
|
91cf593506
|
修改密码代码备份
|
2 years ago |
1178634255
|
de6f13ec27
|
修改密码代码备份
|
2 years ago |
1178634255
|
420dea5428
|
代码备份
|
2 years ago |
schry
|
f89247401a
|
导出产品信息窗口执行‘结果全部导出’操作,导出的文件数据为空
|
2 years ago |
1178634255
|
e20a65a00c
|
新增扫码单模块到待校验单据模块,备注会消失
|
2 years ago |
anthonywj
|
1beea3a254
|
合并dev修改
|
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 |
anthonywj
|
7480c8edbe
|
关联DI必填字段不被覆盖
|
2 years ago |