Commit Graph

324 Commits (1df50657b0912857ddaa653ade9f4d17c1bbb8fc)

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
薛宇 5c788f950c Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 1a87f29e4d 我的巡检任务 2 years ago
郑明梁 6c66ec37ca 设备代码提交 2 years ago
anthonywj 5a22d137d8 预验收选入时增加过滤条件 2 years ago
wangwei b27758f8db 报修单 维保设备清单 2 years ago
薛宇 f189d0b6a3 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 eeb03f7226 单据上传状态 2 years ago
anthonywj 1846ce85dc 发票相关以orderresult表为准 2 years ago
薛宇 a14a6140bf 库存查询的注册/备案号显示多个 2 years ago
anthonywj c5f47f8139 bug修改,新增单据验收补单校验 2 years ago
郑明梁 75f4ff7d7a 单据打印增加自助单号字段 2 years ago
黄泽腾 5c451346ea 供应商发票页面优化问题 2 years ago
黄泽腾 2af01de1e8 新增往来单位搜索备份 2 years ago
黄泽腾 0dec5c2ed0 生成不了多级的内部码,会自动变成一级的内部码(片仔癀诊断和管理系统都有这个问题) 2 years ago
anthonywj 30dcdfd553 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 40fe92d304 发票代码提交 2 years ago
anthonywj 89732532fa Merge branch 'dev_ywj' into dev 2 years ago
schry 3d22b2c8b0 进入“多级产品管理”页面报错提交 2 years ago
anthonywj 3438e4e2fb bug修改 2 years ago
anthonywj 8e95a8e779 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj d2a56b42a1 默认允许无批次号 2 years ago
anthonywj 7c15d5ba3d 默认允许无批次号 2 years ago
1178634255 e20a65a00c 新增扫码单模块到待校验单据模块,备注会消失 2 years ago
wangwei 133f841b7c UdiRelevanceResponse实体类count修改类型 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
郑明梁 883084f4c5 定数包代码提交 2 years ago
anthonywj bec91b93ca 新增协调平台追溯查询 2 years ago
郑明梁 dad49893d3 定数包设置代码提交 2 years ago
anthonywj 3e28f48933 待校验,等相关修改, 2 years ago
anthonywj 91ff79f125 第三方产品信息编辑bug 2 years ago
郑明梁 e2720aff8a 第三方单据新增字段 2 years ago
郑明梁 5513726e0b 单据上传功能 2 years ago
郑明梁 5a377fe206 客户管理bug修复 2 years ago
anthonywj 562cbd5ac2 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj f66705d82b 采购计划,采购订单等相关修改 2 years ago
郑明梁 134762db9e 单据上传功能代码提交 2 years ago
anthonywj 86f084836e 选入第三方业务单据修改 2 years ago
anthonywj 5c0a78e70c 基础信息相关修改 2 years ago
郑明梁 17a0e0b99c Merge branch 'zmlDev' into dev 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 2 years ago
郑明梁 c5b7ba7db5 客户管理功能代码提交 2 years ago
wangwei 5e3901e040 物资类别功能 2 years ago
anthonywj 53aa0b11a8 界面标题等logo修改 2 years ago
wangwei 60b96aaec6 带票出入库明细 增加查询条件等 2 years ago
anthonywj 84b7aae6dc 发票修改同步 2 years ago
anthonywj 374f8261f8 相关bug修改 2 years ago
郑明梁 bfbb85eb57 统计汇总代码提交 2 years ago
郑明梁 66d890ab18 业务单据功能修改 2 years ago
anthonywj 651a0ef658 内部码打印问题,启用使用单元数量问题,申购系统繁忙问题 2 years ago
郑明梁 17a7d9859f 物资拜放bug修复 2 years ago
郑明梁 4b4d6beb7a 第三方bug修改 2 years ago
anthonywj 0f93175ce0 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj 17827ab959 第三方产品信息接口新增厂家编码,供应商编码 2 years ago
郑明梁 e713e03a31 日和月统计代码提交 2 years ago
1178634255 46d5cb0181 内部码标签打印 2 years ago
郑明梁 4a6f792398 多次使用出库新增功能代码提交 2 years ago
郑明梁 d0a507981f 物资新增多次出库设置 2 years ago
1178634255 e58e49b816 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
1178634255 9f1f491db3 修复入账库查询列表不会显示‘计量单位’,生产企业与单据类型的不一致 2 years ago
郑明梁 d72625c5cd Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
郑明梁 3a26eafb7d 多次使用出库新增功能代码提交 2 years ago
anthonywj de758b0fce Merge remote-tracking branch 'origin/dev' into dev 2 years ago
anthonywj b0d1ddda6c 采购订单修改 2 years ago
schry f75b8fdd86 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
schry a6a68cb35f 解决不显示计量单位 2 years ago
郑明梁 14c4bd0248 多次使用出库新增功能代码提交 2 years ago
anthonywj f2968bf275 单据复制,单据流转带业务单信息,采购订单新增价格 2 years ago
郑明梁 32ff539034 多次使用出库设置功能代码提交 2 years ago
郑明梁 d24a412535 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
郑明梁 a1b4542df6 库存查询bug修改 2 years ago
wangwei 4b917f22fd 冷链报告 2 years ago
anthonywj d166dd09d7 采购订单按供应商创建 2 years ago
anthonywj db3e3bd2ca 相关界面调整修改 2 years ago
anthonywj 59a0078a84 新增按货位出库功能 2 years ago
郑明梁 ffc363773e 单据打印修改 2 years ago
郑明梁 851232e270 库存查询新增货架查询 2 years ago
郑明梁 17e1cdc144 库存查询新增货架查询 2 years ago
郑明梁 3b29b7f804 物资摆放下架代码提交 2 years ago
anthonywj b4a00f5c51 发票,单据修改 2 years ago
anthonywj 1003d2ec8f 业务单据详情改成雪花ID 2 years ago
郑明梁 82e46675a9 订单管理id问题修改 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
wangwei 972ed90e40 同步 优化发票代码 2 years ago
wj 4a35a538ae Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wj 7a3e8b72cb 文件下载问题 2 years ago
wangwei f45d18ec7f 同步发票代码 2 years ago
郑明梁 f11e0fbb10 物质摆放变更功能代码提交 2 years ago
郑明梁 1071b496dd 物质摆放按单功能代码提交 2 years ago
wangwei 1bf136848f 同步发票代码 2 years ago
郑明梁 9ac295028b 物质摆放功能代码提交 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
wangwei 5697692584 发票修改 2 years ago
anthonywj a7ef10a6d7 寄售出库问题,预验收入库问题,同步问题,领用单据问题 2 years ago
anthonywj cc248bab94 上线bug修改,同步修改,发票修改 2 years ago
anthonywj 4b08aa2a4e bug修改,上架摆货修改 2 years ago
anthonywj 3cae7526bc 摆货相关修改,添加货位查询,预验收,寄售等相关库存摆货 2 years ago
郑明梁 0d878f1d64 修复id问题 2 years ago
anthonywj eec7d4f87a 带配货功能修改 2 years ago