21 Commits (89732532fa194eb7f2d60a81386ce2d067e99e89)

Author	SHA1	Message	Date
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	375ff7aa5d	新增第三方单据上传过滤	2 years ago
anthonywj	6c2e5b7f14	备份	2 years ago
anthonywj	3cae7526bc	摆货相关修改，添加货位查询，预验收，寄售等相关库存摆货	2 years ago
x_z	90340e2607	1.调整摆放功能代码，添加上架记录	2 years ago
anthonywj	1f6a08e74c	新增三期拣货，无三期拣货，为配货等页面	2 years ago
anthonywj	1e82f37f7f	物资字典参数设置，单据类型修改	2 years ago
anthonywj	a8504f276e	代码迁移备份，预验收退回修改	2 years ago
anthonywj	d14cba051e	单据类型迁移，内部码打印迁移	2 years ago
anthonywj	adc2bae64b	新增业务单据同步	2 years ago
x_z	e2fbaf9443	1.调整巡检计划相关代码	2 years ago
x_z	37b4be08b2	1.修改设备领用逻辑，审核通过后添加到部门设备明细 ... 2.添加保修单，科室设备明细等相关表实体类 3.添加科室设备明细增删改查接口	2 years ago
anthonywj	b2779284f0	bug相关修改，业务单据修改	2 years ago
anthonywj	0b746a5a09	单据流程相关迁移到UDI管理系统	2 years ago
x_z	9868ebd8d0	1.添加生成单日出入库汇总数据逻辑	2 years ago
anthonywj	dfd5e936cb	业务单据，库存相关bug修改	2 years ago
x_z	9e6b381738	1.添加设备领用养护接口	2 years ago
anthonywj	38c5001097	单据流程梳理	2 years ago
x_z	6892a86ce7	1.调整仓库列表查询接口	2 years ago
x_z	9e42e8ee52	1.修改单据列表查询接口，修改参数标识	2 years ago
anthonywj	d9a5d78b7b	first commit	3 years ago