Commit Graph

1262 Commits (b853ee66a5a5e291760ae58ccf1e44a66b54368a)

Author SHA1 Message Date
anthonywj c0a9d39535 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
anthonywj 8cf48f17d2 新增控制是否只校验批次号 2 years ago
郑明梁 a8ad971567 设备报修代码提交 2 years ago
薛宇 48904a0239 Merge remote-tracking branch 'origin/dev' into dev 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
anthonywj f7cbc4f69d socket链接问题 2 years ago
郑明梁 8be3506529 设备巡检任务新增任务级别和保修类型字段 2 years ago
郑明梁 f6f9b599a5 设备保修详情代码提交 2 years ago
郑明梁 32c2798027 设备巡检任务代码提交 2 years ago
郑明梁 c67e86556f Merge remote-tracking branch 'origin/dev' into dev 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
薛宇 5c788f950c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d086c63ab2 根据全局设置项,不校验生产日期和失效日期 2 years ago
anthonywj c57b6a645f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj cda668a04b 第三方单据下载问题 2 years ago
wangwei 1a87f29e4d 我的巡检任务 2 years ago
anthonywj 8e102c1659 第三方产品信息异常问题(回滚) 2 years ago
anthonywj ad2a95e94c 诊断单据产品下载问题 2 years ago
anthonywj 6d1f77967a 打包后消息同步问题 2 years ago
郑明梁 7588e50521 设备巡检计划代码提交 2 years ago
郑明梁 680e6b9979 设备状态类型代码提交 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
wangwei 76e3df3611 报修查询接口优化 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
黄泽腾 f69b85697c 物资资质新增--新增配送产品资质信息 2 years ago
薛宇 f189d0b6a3 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 6a3d9113f6 新增发票确认实时同步 2 years ago
anthonywj 1476a0f894 新增websocket通信(中继服务同步相关) 2 years ago
郑明梁 eeb03f7226 单据上传状态 2 years ago
anthonywj 358081e37e 添加每日汇总测试接口 2 years ago
anthonywj 3da6898176 自助平台确认状态同步问题 2 years ago
wangwei 3585dde191 新增领用过滤零库存和负库存 保存时判断库存 2 years ago
anthonywj d9371c48f5 新增设备管理相关实体类与字段 2 years ago
anthonywj fdd3351a13 单据维护删除系统繁忙问题 2 years ago
anthonywj ddc5eab3cd 协调平台时间格式问题 2 years ago
郑明梁 c39ffb1587 业务单缺失注册证号 2 years ago
郑明梁 8e269ac3b5 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 334523f8c9 单据查询问题修改 2 years ago
anthonywj 1846ce85dc 发票相关以orderresult表为准 2 years ago
anthonywj de7412b096 库存无批次号系统繁忙问题 2 years ago
薛宇 8303e81597 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 7fefd6dc24 追溯查询排序问题 2 years ago
郑明梁 73c14e4e01 预验收库存不足问题修复 2 years ago
薛宇 c43873fafd Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 0b613af049 bug修改,物资字典boolean ->Boolean 2 years ago
薛宇 a1e607223a 养护记录提示 2 years ago
薛宇 9be30bb338 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 430d5b2604 打印修改 2 years ago
薛宇 7f3d03587f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 79fa22c142 修改复制生成单据 填写备注 生成之后备注为空 问题 2 years ago
薛宇 a14a6140bf 库存查询的注册/备案号显示多个 2 years ago
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago
wangwei d69f9449e7 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 18c83f4318 修改 产品di未绑定多个产品id 扫入条码弹指定产品的弹窗 问题 2 years ago
郑明梁 88552a28d9 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
2 years ago
郑明梁 3b0d22d0e0 单据bug修改 2 years ago
wangwei 7f6f78f776 修改 编辑出入库单据流转设置中 无法切换 审核状态问题 2 years ago
wangwei 0f73bcb8d5 修改 无序产品进行出库时 将数量编辑成结余数量 提示库存不足问题 2 years ago
黄泽腾 7cd0d1c06d Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 6daef0a567 字段更正 2 years ago
anthonywj dc78894221 新增自助平台与UDI管理系统库存校验同步 2 years ago
郑明梁 49f578d505 加上规则注释 2 years ago
郑明梁 ba0cfd96c9 维护出入库增加状态控制 2 years ago
郑明梁 910bfe0e8e Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 abc95ff8a4 模板增加字段 2 years ago
wangwei 9bb86c7929 修改 核对送货单 撤回单据至带校验 再次以扫码结果提交 继续核对时核对页面 物资重复显示问题 2 years ago
anthonywj 4498670058 诊断第三方单据详情重复下载问题 2 years ago
anthonywj 721730166b 单据上传轮询遍历问题 2 years ago
郑明梁 c386367832 bug修复 2 years ago
anthonywj 4988e314fb 同步单据审核时间不一致问题 2 years ago
anthonywj 177c600112 代码备份 2 years ago
郑明梁 75f4ff7d7a 单据打印增加自助单号字段 2 years ago
黄泽腾 1516a5104f 往来单位查询 2 years ago
黄泽腾 45335cd21f Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 6b6280852f 往来单位查询 2 years ago
郑明梁 6473840e17 申购单查询状态判断 2 years ago
黄泽腾 a9f1ff3932 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
黄泽腾 b2fafe27ef 内部码打印更新代码 2 years ago
wangwei acd37c413a 修改 维护出入库执行减一 扫码数量未变化问题 2 years ago
郑明梁 80c5d58787 单据上传(回传自助单据号) 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
薛宇 f3fb4e8552 物资过期处理方式无法弹框提醒 2 years ago
郑明梁 cdce81ecb1 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 eda6292cf0 库存明细打印 2 years ago
薛宇 d95fa8811c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
薛宇 1995a0c9ec 建议在“同步设置”页面,添加扫码单据类型功能模块:新增一个 搜索框功能 2 years ago
郑明梁 a40530fc7c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 cece855d6b 三期出现重复序列号问题 2 years ago
黄泽腾 5c451346ea 供应商发票页面优化问题 2 years ago
郑明梁 d9462d3f2e Merge remote-tracking branch 'origin/dev' into dev 2 years ago