Commit Graph

196 Commits (2983a32c3e1c93f6cbc46b718c358bac60bf2d97)

Author SHA1 Message Date
郑明梁 8be3506529 设备巡检任务新增任务级别和保修类型字段 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
郑明梁 83d49b7e06 设备巡检任务sql 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
郑明梁 f3c2f13e2d sql提交 2 years ago
anthonywj d9371c48f5 新增设备管理相关实体类与字段 2 years ago
anthonywj de7412b096 库存无批次号系统繁忙问题 2 years ago
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago
anthonywj 177c600112 代码备份 2 years ago
郑明梁 02f9c363c0 单据表 新增自助单号sql 2 years ago
黄泽腾 d1d99533ce 代码备份 2 years ago
anthonywj 4f25b9ee57 新增备注字段查询时查备注或病人信息 2 years ago
anthonywj d53c9e87ab 新增第三方单据自动下载与配置,日志生成等 2 years ago
anthonywj 89732532fa Merge branch 'dev_ywj' into dev 2 years ago
anthonywj 3438e4e2fb bug修改 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
郑明梁 23d7d1623f 定数包sql提交 2 years ago
anthonywj 3e28f48933 待校验,等相关修改, 2 years ago
郑明梁 29df3286de 申购单流转价格问题修复 2 years ago
anthonywj 91ff79f125 第三方产品信息编辑bug 2 years ago
anthonywj 069069e32b bug修改 2 years ago
anthonywj fce5d7b7c6 申购单据,采购订单等相关修改 2 years ago
anthonywj f66705d82b 采购计划,采购订单等相关修改 2 years ago
anthonywj 5c0a78e70c 基础信息相关修改 2 years ago
anthonywj dd1f68f103 发票相关问题修改 2 years ago
anthonywj 374f8261f8 相关bug修改 2 years ago
郑明梁 ef0bdb8869 sql inv_place_order_detail 增加 topInvSpaceCode字段 2 years ago
anthonywj d3697401a2 单据上传重盖 2 years ago
郑明梁 b895be051e 产品表新增拼音字段 2 years ago
郑明梁 f81471d4e6 新增扫码单据排序 2 years ago
anthonywj f7d09c1ec4 第三方接口相关修改 2 years ago
wj d02dc617a8 sql记录 2 years ago
wj ab780d007f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj dc0a842edf ThrSystemDetailEntity增加表名,ThrProductsEntity增加字段[生产厂家编码,配送企业编码] 2 years ago
郑明梁 ddf0a1866f 内部码报表打印代码提交 2 years ago
郑明梁 fe4b0082e3 单据报表打印代码提交 2 years ago
anthonywj f2968bf275 单据复制,单据流转带业务单信息,采购订单新增价格 2 years ago
wangwei 4b917f22fd 冷链报告 2 years ago
wangwei f6c9fd2297 修改字段 2 years ago
anthonywj 8de2927b19 用户关联单据类型 2 years ago
anthonywj b4a00f5c51 发票,单据修改 2 years ago
anthonywj 1003d2ec8f 业务单据详情改成雪花ID 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
郑明梁 40c9648762 物质摆放变更功能代码提交 2 years ago
wangwei f45d18ec7f 同步发票代码 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
anthonywj cc248bab94 上线bug修改,同步修改,发票修改 2 years ago
wj 0214b2cf94 代码调整 2 years ago
wj 7d39656d92 Merge remote-tracking branch 'origin/master' 2 years ago
wj ef0c71b1e5 记录执行结果 2 years ago
anthonywj f658c2c4c9 bug修改,上架摆货修改 2 years ago
anthonywj 4b08aa2a4e bug修改,上架摆货修改 2 years ago
anthonywj c6e36d0a79 数据同步下载问题 2 years ago
anthonywj 75d388e121 同步功能修改 2 years ago
wangwei 0d51bce1a3 出入库自动补单 业务单自动补单 修改id问题 2 years ago
anthonywj a4838a4459 解决选入用户,移除用户系统繁忙问题 2 years ago
anthonywj 14e43730de ID相关修改 2 years ago
x_z 90340e2607 1.调整摆放功能代码,添加上架记录 2 years ago
wj 4f7b490d88 上传及下载写入文件 2 years ago
wj 0499617822 系统设置同步 2 years ago
anthonywj 54dc7cd0eb 同步数据修改为雪花ID 2 years ago
anthonywj 9e25fc5036 bug修改代码备份 2 years ago
anthonywj 5d1875ebb9 库存详情新增入库数量与出库数量,方便后续分组统计查询 2 years ago
wj 1517d71b78 用户数据同步 2 years ago
anthonywj 5bc3ce3115 业务单选入第三方单据bug 2 years ago
anthonywj 8a9607f690 Merge remote-tracking branch 'origin/master' 2 years ago
anthonywj d730b5c084 数据同步修改 2 years ago
x_z 2302660639 1.医院系统配置表添加第三方系统标识字段 2 years ago
anthonywj a8504f276e 代码迁移备份,预验收退回修改 2 years ago
郑明梁 57898a6731 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/glxp/api/req/basic/BussinessTypeSaveRequest.java
#	src/main/java/com/glxp/api/task/AsyncFetchUdiTask.java
#	src/main/java/com/glxp/api/task/AsyncUdiTask.java
#	src/main/resources/schemas/schema_v2.1.sql
2 years ago
郑明梁 35704f2221 单据类型设置代码提交(同步) 2 years ago
x_z e3c25b05b5 1.添加接口请求时间设置 2 years ago
anthonywj e3c6399aa5 单据流转相关修改 2 years ago
x_z abbc13b2f5 1.合并自助平台库存预警设置的代码 2 years ago
anthonywj f5d87597d6 新增预验收单据类型退回字段 2 years ago
x_z c68cb845a0 1.添加第三方基础数据同步和系统设置同步代码 2 years ago
anthonywj 5c09ceeb6e 同步设置页面重整,,基础数据上传,单据类型上传 2 years ago
anthonywj 03097198f5 单据同步 2 years ago
x_z 9bab80a61e 1.同步库存预警设置代码 2 years ago
anthonywj d47ff60dd6 迁移自助平台单据相关代码 2 years ago
anthonywj adc2bae64b 新增业务单据同步 2 years ago
anthonywj 44fa2c252e 单据复制功能 2 years ago
anthonywj 0b746a5a09 单据流程相关迁移到UDI管理系统 2 years ago
郑明梁 3f9968e9a3 产品添加预警设置 2 years ago
anthonywj 1cdfb36774 添加耗材字典对应集采信息,bug修改 2 years ago
郑明梁 261f7212f4 新增耗材表relCode lowStockNum字段 2 years ago
anthonywj 8a41703215 单据类型,仓库,新增寄售功能,关联库存,寄售库存,以及其他联动 2 years ago
anthonywj a380f67945 单据相关bug修改,单据撤回,单据编辑 2 years ago
anthonywj f68b2e4597 单据相关bug修改 2 years ago
anthonywj 699974a05e 第三方单据类型关联修改, 2 years ago
anthonywj d6abb99481 第三方单据类型,领用单据徐选入 2 years ago
anthonywj b1b6a1b849 新增第三系统设置以及接口相关代码 3 years ago
anthonywj 08fb8afc63 删除非必要权限相关代码类,更改数据库命名相关代码修改 3 years ago
anthonywj d9a5d78b7b first commit 3 years ago