Commit Graph

479 Commits (35c6557734e79e0fba79d0acd386c31f8acb1cb5)

Author SHA1 Message Date
yuanwei 35c6557734 Merge remote-tracking branch 'origin/dev_price' into 20231126-yw 2 years ago
anthonywj 4fc006c1e5 退货单查询异常修改 2 years ago
anthonywj 0fa3c04d98 第三方物资类别修改 2 years ago
anthonywj e266ae4e7b 单据再次出库 2 years ago
yuanwei 0c4632ade8 字典优化处理 2 years ago
yuanwei 09151052c2 初始化动态配置 2 years ago
anthonywj 3aaefed829 单据新增灭菌日期灭菌批号 2 years ago
anthonywj 4886f75d01 单据按di排序 2 years ago
anthonywj 871433c022 新增物价类别 2 years ago
anthonywj bbcdd1dbd2 Merge remote-tracking branch 'origin/dev2.0' into dev_price
# Conflicts:
#	src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java
#	src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java
#	src/main/java/com/glxp/api/service/system/SysMsgTodoService.java
#	src/main/resources/mybatis/mapper/system/SysMsgTodoMapper.xml
2 years ago
wj 4b0099fa2d sys_msg_todo相关 2 years ago
anthonywj f8d447af39 库存添加过滤条件,资质审核展示规格型号 2 years ago
wj e88a9046d3 sys_msg_todo相关 2 years ago
anthonywj e689eec813 平和按第三方打印问题 2 years ago
anthonywj 3db2210e09 修改打印是否按第三方产品信息打印 2 years ago
anthonywj 5df22a6981 内部码分页打印问题,默认打印数量为为1 2 years ago
anthonywj ffe583217d 库存发票相关 2 years ago
anthonywj 49bef11dd9 物资入院申请等相关修改 2 years ago
anthonywj 43e1d463b8 价格先进先出,耗材字典问题,确认单据人问题 2 years ago
anthonywj 9e1acf487f 升级相关问题修改 2 years ago
anthonywj 1c8f6cbeb6 供应商无法在这里切换仓库 2 years ago
anthonywj f9f587decf 往来单位显示问题 2 years ago
anthonywj 99bacc3a0e 切换分支备份 2 years ago
anthonywj 8af7e3432a 切换分支备份 2 years ago
anthonywj 302e204781 物资字典对照问题 2 years ago
anthonywj 1f00bb49de 单据同步修改对应同步时间差 2 years ago
anthonywj 6dea372e6a 系统繁忙问题 2 years ago
anthonywj e6b89730ba 内部码打印全部可打印,切换分支备份 2 years ago
黄泽腾 fa4b03deac 富文本还原 2 years ago
anthonywj 9bab2b4fda 设备任务相互同步 2 years ago
anthonywj c83c5fd8d3 删除任务同步相关调整(后续还需调整) 2 years ago
anthonywj 5f0ed5705d 修改设备任务ID为雪花ID(自增同步会有问题),其他相关bug修改 2 years ago
郑明梁 46b683698c 设备任务接收管理 2 years ago
郑明梁 eec47d10ce 设备任务代码提交 2 years ago
wangwei 131c6f297f 同步删除基础数据 2 years ago
黄泽腾 48905ddb6f Merge branch 'dev' into dev2.0
# Conflicts:
#	src/main/java/com/glxp/api/controller/purchase/SupProductController.java
2 years ago
anthonywj bc7237177c 代码备份 2 years ago
薛宇 625249dea0 根据注册证件备案号判断资质证书 2 years ago
anthonywj 629dddb9f9 修改BeanUtil.copyProperties方法 2 years ago
黄泽腾 99506e1f40 物资资质新增--新增配送产品资质信息 2 years ago
anthonywj 2a790a07d7 新增发票确认实时同步 2 years ago
anthonywj 7ed62f3b38 新增websocket通信(中继服务同步相关) 2 years ago
anthonywj 5ca5575e96 协调平台时间格式问题 2 years ago
anthonywj 4ddd90dda3 发票相关以orderresult表为准 2 years ago
anthonywj 532c75ac11 采购订单无法选择送货单问题 2 years ago
anthonywj 1c32645b85 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 5194ab6afa bug修改 耗材字典字段修改 2 years ago
郑明梁 4fa156876a Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 80225d5788 单据bug修改 2 years ago
薛宇 10b15fae56 Merge remote-tracking branch 'origin/dev' into dev 2 years ago