Commit Graph

1105 Commits (b3a9d01651e20b05cada1e8399c29320cbf12452)

Author SHA1 Message Date
chenhc 1360a8463c feat: 单据备注字段 11 months ago
yewj d71bb120f8 单据流程修改 11 months ago
wangwei a0d22dbc6c 8/23 采集工位根据用户搜索 11 months ago
wangwei 00bde6626c Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj b424a12df9 扫码问题修改 11 months ago
yewj 34a75705fe 代码备份 11 months ago
wangwei e597b19779 8/22 工位优化 11 months ago
yewj 5c8f6a7d00 正在处理单据 11 months ago
yewj e7fbdab3c0 拆零整取数量重新计算 11 months ago
yewj 9609d4a343 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 6ae6c1c329 8/22 现场管理工位调整,单据 11 months ago
yewj ad9ee6fd7a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
yewj f79c6de737 数据初始化计算计量单元数量 11 months ago
chenhc 082f302507 feat: 器械参数设置 11 months ago
yewj 4f5b4282e1 代码备份 11 months ago
chenhc 88513a51f4 feat: 修改 11 months ago
chenhc 1150a2bec9 feat: 修改 11 months ago
wangwei f8cabf42ec 8/21 工查询优化 11 months ago
wangwei 64489e8740 单据类型,工位删除判断 11 months ago
chenhc 1e2282ab49 feat: 修改 11 months ago
wangwei 1bb1291753 8/20 工位绑定单据类型 11 months ago
anthonywj e04b28efe1 代码备份 11 months ago
wangwei fb4ec1218d 8/19 响应工位code 11 months ago
chenhc 243a6c3be9 feat: 修改 11 months ago
anthonywj dce16042f0 测试数据 11 months ago
anthonywj 0e0c19f095 bug修改 11 months ago
chenhc 317cc8e65c feat: 修改现场作业分页接口key增加模糊字段 11 months ago
anthonywj e9b939e99d 单据拆零赋码优化修改 11 months ago
wangwei fccf06cb0e Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 25111c05cc 修改药品第一次选入流通失效 11 months ago
chenhc ab91277787 feat: 页面修改-业务类型、来源系统 11 months ago
wangwei 595651c193 1.2 增加往来单位类型 11 months ago
wangwei 67726020ec 8/15 搜索用户加入仓库字段 11 months ago
anthonywj dcd227d367 校验方式修改,1.三期,无三期,扫码单生成业务单,等一些功能修改 11 months ago
chenhc 08b714b43b feat: 单据in查询 11 months ago
chenhc 76c9764465 feat: 单据in查询 11 months ago
wangwei c6859d461f 8-15 工位管理 1.0 11 months ago
anthonywj 3ee4e9caf9 单据详情接口修改 11 months ago
anthonywj 6b60cc0244 代码备份 11 months ago
wangwei b2983b6c77 工位搜索 11 months ago
wangwei 0a28aa21f6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 4db6d15acf 工位管理 11 months ago
chenhc 2ff822c07a Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 904e8a9950 8/14 工位单据管理 11 months 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
11 months ago
chenhc 4cfe42b996 feat: 首页复制 11 months ago
chenhc c268e0d067 feat: 库存预警 11 months ago
anthonywj b30a908894 重写采集点代码 11 months ago
anthonywj 9278b88162 采集点代码生成 11 months ago
anthonywj bae3fb9c30 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
anthonywj d4e2b85982 拆零优化 11 months ago
wangwei b757ab2ffb 8/12 药品字段数据 11 months ago
anthonywj e3410ca4c2 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 11 months ago
wangwei 95cd6628f5 8/9 药品管理字段优化,生成单据的时候设置产品类型,响应字段,带票出入库根据订单号分组过滤 11 months ago
anthonywj d96d75634f 切换分支备份 11 months ago
anthonywj 7e021afe6e 药品扫码相关修改 11 months ago
anthonywj e645d38789 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
anthonywj e7d743faa0 切换分支备份 11 months ago
wangwei f9a09de847 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
11 months ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 11 months ago
anthonywj 274aefa911 处方相关修改 11 months ago
anthonywj 0f1ee49172 预出库扫码修改,处方赋码修改 12 months ago
wangwei 26d23af14a 8/02 选入收费项目 12 months ago
chenhc 4b6ac18da9 feat: 带票出入库明细 12 months ago
chenhc 701d39e3ba feat: 就诊卡 12 months ago
anthonywj 771886a42d Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 12 months ago
anthonywj f1cd9fd1d6 四级库库存查询 12 months ago
chenhc 8fdd2a487d feat: 带票出入库明细 12 months ago
wangwei b329488995 单据查看药品字典详情 12 months ago
anthonywj 0cc61f9f59 新增拆零队列 12 months ago
anthonywj 0ec915d253 平潭收费出库明细 12 months ago
anthonywj 4409ea42e3 药品字典修改 12 months ago
anthonywj 15fe481b72 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z 12 months ago
anthonywj 6d2014e1f6 切换分支备份,选择库存自定义界面 12 months ago
anthonywj ed3b454631 切换分支备份,选择库存自定义界面 12 months ago
wangwei c84ff8236c 7/30 药品管理 12 months ago
anthonywj ca74b54400 切换分支备份 12 months ago
anthonywj 6cde6e6fee 单据删除 12 months ago
anthonywj d101ee2c2c 切换分支备份 12 months ago
wangwei 77f78557d6 Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
12 months ago
wangwei 58a8377531 7/29 1.1 更改药品 12 months ago
chenhc a4a05d4756 feat: 药品出入库明细、汇总、入账库 12 months ago
anthonywj 08182d3d68 新增是否组套,单据出入库明细查询 12 months ago
anthonywj acc2afebdf 切换分支备份 12 months ago
anthonywj 147c9f3fa9 拆零相关修改 12 months ago
wangwei dfd2e2bfce Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z
# Conflicts:
#	src/main/resources/schemas/schema_v2.4.sql
12 months ago
wangwei 7b0a9dd058 7/27 1.1 12 months ago
anthonywj 878f571a3b 新增医保拆零,医保收费项目,中西药,中药饮品,医用耗材等 12 months ago
anthonywj de0987058c Merge branch 'dev_fifo' into dev_fifo_z 12 months ago
wangwei 502c13d74a 7/26 sql 12 months ago
wangwei bba7ed9e2b 7/26 sql 12 months ago
wangwei 8a614fd0bc 1.1 12 months ago
anthonywj a74e1f0109 库存预警修改 12 months ago
anthonywj 1211a2d256 发票登记过滤 1 year ago
wangwei f5c5b10c21 7/11 sql 1 year ago
anthonywj c064fa3629 患者信息修改, 1 year ago
anthonywj 0cee7aee54 读患者信息问题 1 year ago
anthonywj f16521fbbb 平潭修改患者信息下载 1 year ago
anthonywj a508f850a2 南靖新增第三方产品编码返回 1 year ago
anthonywj 184b3c8139 南靖接口调用查库存修改 1 year ago