Commit Graph

669 Commits (9dd61ba84198c313cb73a5cbd2c680f780da3bcf)

Author SHA1 Message Date
黄泽腾 9dd61ba841 Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
#	src/main/resources/application-dev.yml
2 years ago
黄泽腾 55c2c3233d 中医院往来信息单位显示 2 years ago
郑明梁 e3dae86c72 Merge remote-tracking branch 'origin/dev' into dev2.0 2 years ago
郑明梁 a268df2cdb 设备bug修改提交 2 years ago
anthonywj 1409fdc451 接口地址重复 2 years ago
anthonywj 249edf57b8 Merge remote-tracking branch 'origin/dev2.0' into dev2.0 2 years ago
anthonywj 422f9e788c 新增单据核对接口 2 years ago
郑明梁 60f9a148de 领用代码提交 2 years ago
黄泽腾 0d85313688 Merge branch 'dev' into dev2.0 2 years ago
anthonywj a6436a4642 pda待校验待配货等单据下载接口 2 years ago
薛宇 384a0f54cc 领用仓库选择二级仓库的话,可以领用上一级中心库的产品 2 years ago
anthonywj 13ada50cc3 Merge branch 'dev' into ywj_dev
# Conflicts:
#	src/main/resources/application-dev.yml
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
郑明梁 e5d28786dd 设备报修代码提交 2 years ago
wangwei cffb595319 报修详情接口 2 years ago
wangwei c959fc118d 报修详情接口 2 years ago
wangwei 21294acab7 详情接口 2 years ago
wangwei 6d8e7bdf87 报修详情接口 2 years ago
郑明梁 d66303b2fb 设备巡检任务代码提交 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
wangwei 1a87f29e4d 我的巡检任务 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
黄泽腾 f69b85697c 物资资质新增--新增配送产品资质信息 2 years ago
anthonywj 358081e37e 添加每日汇总测试接口 2 years ago
anthonywj 3da6898176 自助平台确认状态同步问题 2 years ago
wangwei 3585dde191 新增领用过滤零库存和负库存 保存时判断库存 2 years ago
anthonywj d9371c48f5 新增设备管理相关实体类与字段 2 years ago
anthonywj ddc5eab3cd 协调平台时间格式问题 2 years ago
郑明梁 c39ffb1587 业务单缺失注册证号 2 years ago
anthonywj 1846ce85dc 发票相关以orderresult表为准 2 years ago
anthonywj de7412b096 库存无批次号系统繁忙问题 2 years ago
anthonywj 7fefd6dc24 追溯查询排序问题 2 years ago
anthonywj 0b613af049 bug修改,物资字典boolean ->Boolean 2 years ago
郑明梁 430d5b2604 打印修改 2 years ago
wangwei 79fa22c142 修改复制生成单据 填写备注 生成之后备注为空 问题 2 years ago
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago
郑明梁 3b0d22d0e0 单据bug修改 2 years ago
郑明梁 49f578d505 加上规则注释 2 years ago
郑明梁 ba0cfd96c9 维护出入库增加状态控制 2 years ago
郑明梁 abc95ff8a4 模板增加字段 2 years ago
郑明梁 c386367832 bug修复 2 years ago
anthonywj 177c600112 代码备份 2 years ago
郑明梁 75f4ff7d7a 单据打印增加自助单号字段 2 years ago
郑明梁 6473840e17 申购单查询状态判断 2 years ago
郑明梁 92f760d50b 明细打印 2 years ago
黄泽腾 4ac8eb7c0e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 55232a4b3f 无三期业务单配/拣货提交业务单时,会受到’有三期业务单配/拣货‘单据类型的影响 2 years ago
wangwei b44424d672 修改 采购订单 到货时间比单据创建时间早 2 years ago
薛宇 de65f6237a Merge remote-tracking branch 'origin/dev' into dev 2 years ago