wangwei
|
e597b19779
|
8/22 工位优化
|
1 year ago |
yewj
|
5c8f6a7d00
|
正在处理单据
|
1 year ago |
|
yewj
|
e7fbdab3c0
|
拆零整取数量重新计算
|
1 year ago |
|
yewj
|
9609d4a343
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
6ae6c1c329
|
8/22 现场管理工位调整，单据
|
1 year ago |
|
yewj
|
ad9ee6fd7a
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
yewj
|
f79c6de737
|
数据初始化计算计量单元数量
|
1 year ago |
chenhc
|
082f302507
|
feat: 器械参数设置
|
1 year ago |
|
chenhc
|
88513a51f4
|
feat: 修改
|
1 year ago |
|
chenhc
|
1150a2bec9
|
feat: 修改
|
1 year ago |
|
wangwei
|
f8cabf42ec
|
8/21 工查询优化
|
1 year ago |
|
wangwei
|
64489e8740
|
单据类型，工位删除判断
|
1 year ago |
|
wangwei
|
1bb1291753
|
8/20 工位绑定单据类型
|
1 year ago |
anthonywj
|
5e1d1e51e2
|
代码备份
|
1 year ago |
|
anthonywj
|
e04b28efe1
|
代码备份
|
1 year ago |
|
chenhc
|
2284b641b7
|
feat: 修改
|
1 year ago |
|
anthonywj
|
44b8a8d04b
|
代码备份
|
1 year ago |
|
anthonywj
|
3fe4496e79
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
chenhc
|
243a6c3be9
|
feat: 修改
|
1 year ago |
|
anthonywj
|
e56d3770b6
|
代码备份
|
1 year ago |
|
anthonywj
|
0d2db0eb60
|
单据校验修改
|
1 year ago |
|
anthonywj
|
0e0c19f095
|
bug修改
|
1 year ago |
|
wangwei
|
8abe46cd10
|
优化 绑定工位
|
1 year ago |
|
anthonywj
|
5e7af56b93
|
自动拆零查询详情
|
1 year ago |
|
anthonywj
|
e9b939e99d
|
单据拆零赋码优化修改
|
1 year ago |
|
anthonywj
|
70c109e0ee
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
anthonywj
|
d79001655c
|
代码备份
|
1 year ago |
|
wangwei
|
67726020ec
|
8/15 搜索用户加入仓库字段
|
1 year ago |
|
anthonywj
|
dcd227d367
|
校验方式修改，1.三期，无三期，扫码单生成业务单，等一些功能修改
|
1 year ago |
|
chenhc
|
08b714b43b
|
feat: 单据in查询
|
1 year ago |
|
chenhc
|
76c9764465
|
feat: 单据in查询
|
1 year ago |
|
anthonywj
|
4cbd788597
|
备份
|
1 year ago |
|
wangwei
|
c6859d461f
|
8-15 工位管理 1.0
|
1 year ago |
|
anthonywj
|
3ee4e9caf9
|
单据详情接口修改
|
1 year ago |
|
wangwei
|
0a28aa21f6
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
4db6d15acf
|
工位管理
|
1 year ago |
|
chenhc
|
2ff822c07a
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
|
1 year ago |
|
wangwei
|
904e8a9950
|
8/14 工位单据管理
|
1 year ago |
|
chenhc
|
b697699668
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo_z
# Conflicts:
# src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
# src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
# src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
# src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
# src/main/java/com/glxp/api/res/inv/InvProductResponse.java
# src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java
# src/main/resources/application-dev.yml
# src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
# src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
# src/main/resources/mybatis/mapper/inv/invProductDao.xml
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
chenhc
|
4cfe42b996
|
feat: 首页复制
|
1 year ago |
|
anthonywj
|
fda2478831
|
切换分支备份
|
1 year ago |
|
chenhc
|
c268e0d067
|
feat: 库存预警
|
1 year ago |
|
anthonywj
|
b30a908894
|
重写采集点代码
|
1 year ago |
|
anthonywj
|
d4e2b85982
|
拆零优化
|
1 year ago |
|
wangwei
|
95cd6628f5
|
8/9 药品管理字段优化，生成单据的时候设置产品类型,响应字段，带票出入库根据订单号分组过滤
|
1 year ago |
|
anthonywj
|
7e021afe6e
|
药品扫码相关修改
|
1 year ago |
|
anthonywj
|
e645d38789
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
anthonywj
|
e7d743faa0
|
切换分支备份
|
1 year ago |
|
wangwei
|
f9a09de847
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
wangwei
|
dfe7b8769e
|
8/8 药品搜索字段以及插入字段维护
|
1 year ago |
|
anthonywj
|
c2b8f4bf2e
|
处方分配工位修改
|
1 year ago |
|
wangwei
|
26d23af14a
|
8/02 选入收费项目
|
1 year ago |
|
chenhc
|
2860529256
|
feat: 处方下载
|
1 year ago |
|
anthonywj
|
01d873f317
|
基础数据修改
|
1 year ago |
|
chenhc
|
4b6ac18da9
|
feat: 带票出入库明细
|
1 year ago |
|
anthonywj
|
f1cd9fd1d6
|
四级库库存查询
|
1 year ago |
|
chenhc
|
8fdd2a487d
|
feat: 带票出入库明细
|
1 year ago |
|
anthonywj
|
0cc61f9f59
|
新增拆零队列
|
1 year ago |
|
anthonywj
|
17b98d8ab0
|
药品信息编辑以及层级包装数量换算
|
1 year ago |
|
anthonywj
|
4409ea42e3
|
药品字典修改
|
1 year ago |
|
anthonywj
|
791f8c09fd
|
切换分支备份,选择库存自定义界面
|
1 year ago |
|
anthonywj
|
ed3b454631
|
切换分支备份,选择库存自定义界面
|
1 year ago |
|
wangwei
|
c84ff8236c
|
7/30 药品管理
|
1 year ago |
|
wangwei
|
77f78557d6
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
wangwei
|
58a8377531
|
7/29 1.1 更改药品
|
1 year ago |
|
chenhc
|
a4a05d4756
|
feat: 药品出入库明细、汇总、入账库
|
1 year ago |
|
anthonywj
|
08182d3d68
|
新增是否组套，单据出入库明细查询
|
1 year ago |
|
anthonywj
|
147c9f3fa9
|
拆零相关修改
|
1 year ago |
|
wangwei
|
dfd2e2bfce
|
Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
wangwei
|
7b0a9dd058
|
7/27 1.1
|
1 year ago |
|
anthonywj
|
878f571a3b
|
新增医保拆零，医保收费项目，中西药，中药饮品，医用耗材等
|
1 year ago |
|
anthonywj
|
de0987058c
|
Merge branch 'dev_fifo' into dev_fifo_z
|
1 year ago |
|
wangwei
|
8a614fd0bc
|
1.1
|
1 year ago |
|
anthonywj
|
1211a2d256
|
发票登记过滤
|
1 year ago |
|
anthonywj
|
c064fa3629
|
患者信息修改,
|
1 year ago |
|
chenhc
|
8f054d1410
|
feat: 0702-扫码校验功能
|
1 year ago |
|
chenhc
|
6ce53c5bea
|
feat: 0702-扫码校验功能
|
1 year ago |
|
wangwei
|
bcbe3745b5
|
6/21 同步优化
|
1 year ago |
|
wangwei
|
d2a7f661a0
|
6/7 单据搜索
|
1 year ago |
|
wangwei
|
2572ca2b7e
|
6/4 优化发票确认时间以及相关带票查询
|
1 year ago |
|
chenhc
|
8bf33df981
|
feat: 0531增加是否需要扫码字段
|
1 year ago |
|
chenhc
|
ddb0a24f8d
|
feat: 0531科室出库
|
1 year ago |
|
anthonywj
|
3f649b0abf
|
Merge remote-tracking branch 'origin/dev_fifo' into dev_fifo
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
anthonywj
|
87d3b9486f
|
新增耗材类别校验
|
1 year ago |
|
chenhc
|
a15afd2f5a
|
feat: 0527开发论证功能
|
1 year ago |
|
chenhc
|
e4faa404e0
|
feat: 0523开发询价模块
|
1 year ago |
|
chenhc
|
65e6bdf631
|
feat: 0521 优化
|
1 year ago |
|
chenhc
|
b20a361cf1
|
feat: 0520 优化
|
1 year ago |
|
wangwei
|
fd7dc88243
|
5-20 提交保养相关接口
|
1 year ago |
|
wangwei
|
a5ddecac51
|
5/17 保养计划优化 前端 巡检/维修/保养 记录 暂时没按钮
|
1 year ago |
|
chenhc
|
b27ec0f73a
|
feat: 0517优化
|
1 year ago |
|
chenhc
|
fc6daa33f2
|
feat: 0517优化
|
1 year ago |
|
chenhc
|
325f6d6961
|
feat: 0516优化
|
1 year ago |
|
wangwei
|
ed8ca33559
|
Merge branch 'dev_fifo1.0' into dev_fifo
# Conflicts:
# src/main/java/com/glxp/api/entity/dev/DeviceCheckDetailEntity.java
# src/main/java/com/glxp/api/entity/dev/DeviceInfoEntity.java
# src/main/java/com/glxp/api/entity/dev/DeviceRepairApplyDetailEntity.java
# src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java
# src/main/resources/schemas/schema_v2.4.sql
|
1 year ago |
|
wangwei
|
67955cae03
|
增加 保养计划
|
1 year ago |
|
chenhc
|
560af1ae62
|
feat: 设备管理优化-0514-设备卡片
|
1 year ago |
|
chenhc
|
5e393ab5ab
|
feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理
|
1 year ago |
|
chenhc
|
1c5e86da2d
|
feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理
|
1 year ago |
|
chenhc
|
b096280db6
|
feat: 设备管理优化-0513-合同管理复制
|
1 year ago |
|
chenhc
|
770caa552c
|
feat: 设备管理优化-0512-增加移除设备的审批流程
|
1 year ago |
|
chenhc
|
11754a27bb
|
feat: 设备管理优化-0512-增加移除类型
|
1 year ago |
|
chenhc
|
44bc4aa00a
|
feat: 设备管理优化-0512-修改提示语
|
1 year ago |
|
wangwei
|
f9b273fcb6
|
5-10 数据同步
|
1 year ago |
|
chenhc
|
958aa625ad
|
feat: 设备管理优化-0510
|
1 year ago |
|
chenhc
|
58ace1f05d
|
feat: 设备管理优化
|
1 year ago |
|
chenhc
|
46ae4e7141
|
feat: 本部门保修单、报修单大厅、我的报修单、我的维修单
|
2 years ago |
|
anthonywj
|
308f817e82
|
设备巡检任务处理
|
2 years ago |
|
anthonywj
|
3cb3fcfdec
|
设备巡检管理
|
2 years ago |
|
chenhc
|
f81d29c601
|
feat: 设备入库、变更、报废
|
2 years ago |
|
chenhc
|
1731ad25ec
|
feat: 设备信息增加字段
|
2 years ago |
|
chenhc
|
c6bdd36a42
|
feat: 设备登记、设备入库
|
2 years ago |
|
chenhc
|
944eb77b92
|
feat: 提交
|
2 years ago |
|
anthonywj
|
8fa91cee91
|
新增下载收费项目字典
|
2 years ago |
|
anthonywj
|
36a026f075
|
申购仓库修改
|
2 years ago |
|
anthonywj
|
ee737966d2
|
登录密码验证
|
2 years ago |
|
chenhc
|
baff72c8ef
|
feat: 术式名称修改
|
2 years ago |
|
chenhc
|
449de7adb4
|
feat: 术士套包、定数包功能开发优化
|
2 years ago |
|
chenhc
|
9c6b03fb1b
|
feat: 术士套包、定数包功能开发
|
2 years ago |
|
chenhc
|
50490a88dc
|
feat: 术士套包、定数包功能开发
|
2 years ago |
|
anthonywj
|
5cc8365472
|
科室出库修改
|
2 years ago |
|
chenhc
|
85d9561d65
|
feat: 新增业务单据加上单据类型过滤物资录入
|
2 years ago |
|
chenhc
|
ad57946821
|
feat: 产品增加采购类型校验
|
2 years ago |
|
chenhc
|
d4a5f6d67f
|
feat: 定数包项目
|
2 years ago |
|
chenhc
|
8b740b8d33
|
feat: 打印功能增加字段
|
2 years ago |
|
chenhc
|
11270c57dc
|
feat: 第三方明细下载增加字段
|
2 years ago |
|
chenhc
|
fda7209233
|
feat: 科室医保分类功能
|
2 years ago |
|
chenhc
|
879b532494
|
dev_ksck → origin/dev_ksck
|
2 years ago |
|
chenhc
|
b50b981c65
|
feat: 增加页面的医保耗材信息调用功能
|
2 years ago |
|
chenhc
|
493b1b6ca6
|
feat: 设备管理-设备登记-动态加载子组件
|
2 years ago |
|
chenhc
|
371c37c35f
|
feat: 设备管理-卡片开发
|
2 years ago |
|
chenhc
|
255b6f1826
|
feat: 设备管理开发
|
2 years ago |
|
chenhc
|
07be51ee6f
|
feat: 审核开关-业务页面修改
|
2 years ago |
|
chenhc
|
9acdef9af4
|
feat: 审核开关
|
2 years ago |
|
chenhc
|
afd1e7fb7d
|
feat: 供三方调用接口开发
|
2 years ago |
|
chenhc
|
1cde4618ad
|
feat: 供三方调用接口开发
|
2 years ago |
|
anthonywj
|
778f4424ac
|
xm包名问题
|
2 years ago |
|
chenhc
|
54d3d3244a
|
feat: 审核流程配置功能
|
2 years ago |
|
chenhc
|
79496895ad
|
Merge remote-tracking branch 'origin/dev_20240306' into dev_fifo
# Conflicts:
# src/main/resources/schemas/schema_v2.4.sql
|
2 years ago |
|
anthonywj
|
53585f97a6
|
新增耗材分类
|
2 years ago |
|
anthonywj
|
04cbe6afc8
|
业务单生成扫码单执行先进先出原则
|
2 years ago |
|
chenhc
|
fa55bd5ab8
|
feat: 提交
|
2 years ago |
|
chenhc
|
79c5ac8ef4
|
feat: 代码保存
|
2 years ago |
|
anthonywj
|
13ac0d742f
|
普耗，收费出库生成单据优化
|
2 years ago |
|
anthonywj
|
207f3324d4
|
项目组套新增供应商ID
|
2 years ago |
|
chenhc
|
96dba85918
|
feat: 三方出入库明细功能
|
2 years ago |
|
chenhc
|
d4ac5e9fcf
|
feat: 增加产品-产品属性字段
|
2 years ago |
|
anthonywj
|
9e79e7cda9
|
Merge branch '20231126-yw' into dev_ksck
# Conflicts:
# src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java
# src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderMapper.java
# src/main/java/com/glxp/api/service/thrsys/ThrInvOrderDetailService.java
# src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java
# src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
# src/main/resources/mybatis/mapper/thrsys/ThrInvOrderMapper.xml
|
2 years ago |
|
chenhc
|
85c9db2ae5
|
feat: 项目组套和三方出入库明细
|
2 years ago |
|
anthonywj
|
34ac7603bd
|
Merge branch '20231126-yw' into dev_ksck
|
2 years ago |
|
chenhc
|
a20becfb13
|
feat: 耗材字典新增功能
|
2 years ago |
