Commit Graph

71 Commits (a257c8a3a7b50b49a7ad627d8fe890434ea62add)

Author SHA1 Message Date
anthonywj 00c2995717 预验收库存,领用等修改 2 years ago
wj b65d72d1d5 调整/还原 2 years ago
wj 006ada7ca6 调整 2 years ago
anthonywj 0074c56c9d 盘点相关功能 2 years ago
anthonywj 474971fb2f 新增盘点功能代码 2 years ago
anthonywj 1b6eb549d8 设备管理相关代码整理 2 years ago
anthonywj 12f1851bba 业务单据打印等,出入库明细打印等 2 years ago
anthonywj c91f10609f 价格校验备份 2 years ago
anthonywj d9d4ca1771 新增价格相关处理 2 years ago
郑明梁 06ebf55ed0 Merge remote-tracking branch 'origin/dev2.0' into dev2.0
# Conflicts:
#	src/main/resources/schemas/schema_v2.2.sql
2 years ago
郑明梁 af21cfdf13 设备代码提交 2 years ago
anthonywj 5b15f6ff45 诊断第三方产品信息定时选入时,自动添加到耗材字典 2 years ago
anthonywj e16a34bc39 巡检计划定时任务补充(未完成) 2 years ago
anthonywj 422f9e788c 新增单据核对接口 2 years ago
anthonywj 9afe11946b 批次号为空时插入库存出现空字符串 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
anthonywj 768bb39532 是否包含序列号 2 years ago
anthonywj 3e28f48933 待校验,等相关修改, 2 years ago
郑明梁 d79a83de2d bug修复 2 years ago
anthonywj 86f084836e 选入第三方业务单据修改 2 years ago
郑明梁 31d1c52a30 单据上传功能代码提交 2 years ago
郑明梁 487473f91c 多次出库bug修改 2 years ago
anthonywj 374f8261f8 相关bug修改 2 years ago
郑明梁 fed1bc9bde 单据判断序列号 2 years ago
郑明梁 90f1b6c334 产品名称转拼音首字母 2 years ago
anthonywj 651a0ef658 内部码打印问题,启用使用单元数量问题,申购系统繁忙问题 2 years ago
anthonywj 6e6b56085c 代码备份 2 years ago
1178634255 ed08449b2c 修复审核申购单报错 2 years ago
郑明梁 d72625c5cd Merge remote-tracking branch 'origin/zmlDev' into dev 2 years ago
anthonywj ee89548201 排序相关修改 2 years ago
郑明梁 14c4bd0248 多次使用出库新增功能代码提交 2 years ago
anthonywj f2968bf275 单据复制,单据流转带业务单信息,采购订单新增价格 2 years ago
anthonywj 23dacbc0d7 bug修改 2 years ago
anthonywj 75077b05a4 同步相关问题修改。用户选入物资字典相关修改 2 years ago
x_z 90340e2607 1.调整摆放功能代码,添加上架记录 2 years ago
anthonywj 9e25fc5036 bug修改代码备份 2 years ago
wj 6c13eb05d4 Merge remote-tracking branch 'origin/master' 2 years ago
wj cdfda6af2a 由内向外同步 2 years ago
wangwei 1524185bc6 同步 内部码 2 years ago
x_z faf499a4c6 1.合并第三方接口请求 2 years ago
anthonywj e3c6399aa5 单据流转相关修改 2 years ago
wj 61bbeeda53 拉取基础数据 插入数据库 2 years ago
wangwei 1e57b7ca4f 汇总记录,导出excel 2 years ago
wangwei 7d6341a9c2 导出excel 2 years ago
chengqf a9683c7675 out.close() 2 years ago
x_z fd9aae06ce 1.调整科室设备明细,设备巡检设置接口 2 years ago
x_z 37b4be08b2 1.修改设备领用逻辑,审核通过后添加到部门设备明细
2.添加保修单,科室设备明细等相关表实体类
3.添加科室设备明细增删改查接口
2 years ago
anthonywj b2779284f0 bug相关修改,业务单据修改 2 years ago
x_z 9868ebd8d0 1.添加生成单日出入库汇总数据逻辑 2 years ago
x_z 340073ea81 1.添加物资出入库汇总数据生成代码 2 years ago