Commit Graph

280 Commits (1409fdc45148909ed94e3aa44cd067aa97f221c5)

Author SHA1 Message Date
黄泽腾 0d85313688 Merge branch 'dev' into dev2.0 2 years ago
anthonywj a6436a4642 pda待校验待配货等单据下载接口 2 years ago
黄泽腾 8af8962464 发票DI编码展示 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
薛宇 48904a0239 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
wangwei 6d8e7bdf87 报修详情接口 2 years ago
郑明梁 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