Commit Graph

99 Commits (5662dc31d6259efb97197fd12b63e14436737b8d)

Author SHA1 Message Date
wangwei d23572b7cf 10/21 同步单据修改 9 months ago
chenhc e66332e4fb feat: 药品关联信息上下传输功能 9 months ago
chenhc dcfa320847 fix: 拉取外网药品关联信息 9 months ago
wangwei df00fdc69e 10/15 基础数据 器械优化 9 months ago
chenhc dbf696db1e feat: 手工、拼箱关联修改 9 months ago
wangwei 7cfe54fa39 8/28 药品数据维护第三方药品 10 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
anthonywj aeffbc51ab 切换分支备份 11 months ago
wangwei dfe7b8769e 8/8 药品搜索字段以及插入字段维护 11 months ago
anthonywj a6e0e99ec5 切换分支备份 11 months ago
anthonywj cb12947cf6 切换分支备份 11 months ago
wangwei bcbe3745b5 6/21 同步优化 1 year ago
wangwei f9b273fcb6 5-10 数据同步 1 year ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj 1b6eb549d8 设备管理相关代码整理 2 years ago
anthonywj b4fdb1a165 替换 BeanUtil.copyProperties 2 years ago
anthonywj cdffd6e6f8 更换BeanUtils.copyProperties 2 years ago
anthonywj 319484c145 1:手持终端相关接口补充
2:待校验以校验结果提交,未生成单据详情问题
2 years ago
anthonywj 113457a42a 设备任务相互同步 2 years ago
anthonywj c3a8c5da54 删除任务同步相关调整(后续还需调整) 2 years ago
anthonywj d28b4f1699 同步任务备份 2 years ago
anthonywj 3da6898176 自助平台确认状态同步问题 2 years ago
anthonywj 447526f19c 误删登记状态 2 years ago
郑明梁 40fe92d304 发票代码提交 2 years ago
anthonywj 2faa905bfb 第三方单据上传bug,发票重复bug 2 years ago
anthonywj 86f084836e 选入第三方业务单据修改 2 years ago
anthonywj 5c0a78e70c 基础信息相关修改 2 years ago
anthonywj 70c0784584 申购,相关查询修改 2 years ago
anthonywj 4cd4d9b44c 单据重复提交问题 2 years ago
anthonywj 3c98777e20 第三方接口调试 2 years ago
anthonywj 3e53fea186 第三方接口下载bug修改 2 years ago
anthonywj be5f16b38d 库存货位查询 2 years ago
anthonywj 0d3c032660 库存查询修改,内网单据确认同步到外网 2 years ago
wj 62367e9acf 同步文件调整 2 years ago
wj 9019c8b6cc 去除方法Resource注解 2 years ago
anthonywj 8a8965e1e7 新增单据详情,发票、确认状态,同步更新, 2 years ago
wj 1ea8e7c2d4 文件下载调整 2 years ago
wj 0bc9b927ce bug修复 2 years ago
wj da57675d60 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj dded9d696b 时间判断调整 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
wj 7a3e8b72cb 文件下载问题 2 years ago
wj 5208a1aea2 拉取数据增加特殊处理 2 years ago
wj 102cf093c2 增加replace,replaceBatch,insertIgnore,insertIgnoreBatch 2 years ago
anthonywj a7ef10a6d7 寄售出库问题,预验收入库问题,同步问题,领用单据问题 2 years ago
anthonywj cc248bab94 上线bug修改,同步修改,发票修改 2 years ago
wj e8cdafc14b 调整任务开始时间 2 years ago
wj 3143e58c0b 代码调整 2 years ago
wj 0214b2cf94 代码调整 2 years ago
wj 7d39656d92 Merge remote-tracking branch 'origin/master' 2 years ago