Commit Graph

328 Commits (purchase)
 

Author SHA1 Message Date
anthonyywj2 f7e8306ba7 Merge branch 'busUser' into purchase 2 years ago
anthonyywj2 fecae19d57 采购管理bug修改 2 years ago
anthonyywj2 29e93d9a6c 单据领用校验问题 2 years ago
anthonyywj2 34f975c5a1 首映功能完善,领用功能完善,采购管理完善 2 years ago
zhengmingliang 98205efb9f 修复仓库字典单据显示问题 2 years ago
anthonyywj2 d5a6e01714 首营功能完善 2 years ago
zhengmingliang 82830c9c1c 修改bug 2 years ago
zhengmingliang 2a08b60f3b 修复判断导入对比bug 2 years ago
zhengmingliang 930ec3db5d 委托任务同步bug修改 2 years ago
zhengmingliang 9c8f853e06 测试 2 years ago
anthonyywj2 3192373932 Merge branch 'busUser' into purchase 3 years ago
anthonyywj2 3d22ec1593 产品关联写入多了个, 3 years ago
anthonyywj2 9054f3f250 切换分支物资管理系统备份 3 years ago
anthonyywj2 43c2b5a72e 代码同步,平和接口对接修改 3 years ago
anthonyywj2 90a424dd12 国家库同步时报错 3 years ago
anthonyywj2 66706d2019 代码同步 3 years ago
anthonyywj2 80b19f4cea 新增第三方产品信息上传审核,中继服务同步问题,定时任务问题 3 years ago
anthonyywj2 374cfda8aa 第三方服务bug修改!功能大改造取得阶段性胜利 3 years ago
anthonyywj2 59a55e2415 第三方服务bug修改! 3 years ago
anthonyywj2 3306777722 业务单据回退代码copy 3 years ago
anthonyywj2 19f32be2a0 第三方服务更新 3 years ago
x_z f477c2e068 1.修复用户未关联单据类型的情况下可以查询出所有单据类型的问题 3 years ago
anthonyywj2 5a53d3f435 Merge remote-tracking branch 'origin/busUser' into busUser 3 years ago
anthonyywj2 1361c92269 同步bug,单据上传到智业定时任务问题,查询是否可以上传问题,自动同步问题等修改 3 years ago
x_z 90c25c2720 1.添加进口产品代理商字段
2.新增查询用户关联单据类型接口
3 years ago
x_z f73f0d0556 1.调整查询医院用户列表接口参数 3 years ago
x_z 14e7564779 1.取消查询用户列表分页 3 years ago
x_z c0c936569c 1.修复插入用户表字段不对应导致插入失败问题 3 years ago
x_z a817780fc5 1.添加第三方单据查询参数 3 years ago
x_z 763f8e3338 1.添加同步时间查询条件
2.修改日志文件路径为相对路径,修复系统无指定盘符导致启动失败问题
3 years ago
anthonyywj2 d994846fbf bug收尾 3 years ago
anthonyywj2 b3d8fe831d 领用单据相关bug修改,第三方业务单据修改 3 years ago
anthonyywj2 b3c8f5b5fd bug修改 3 years ago
anthonyywj2 4233afd2d0 Merge remote-tracking branch 'origin/busUser' into busUser 3 years ago
x_z d8d3ae7393 1.添加条码校验批次号,使用产品设置参数做一次校验
2.修复库存统计报错问题
3 years ago
x_z 954addf7f7 1.单据实体类增加三期校验字段 3 years ago
anthonyywj2 b898849d8a Merge remote-tracking branch 'origin/busUser' into busUser 3 years ago
x_z 1e9e3b4a0a 1.编辑条码增加数据校验,修复数量小于1时可以提交的问题 3 years ago
x_z ba850eb92a 1.修改第三方系统更新接口数据校验逻辑错误问题
2.调整往来单位实体类校验注解
3 years ago
anthonyywj2 8256856559 Merge branch 'fengcang' into busUser 3 years ago
anthonyywj2 4153c8e28f UDI同步库查询i优化 3 years ago
anthonyywj2 702533ed24 Merge branch 'fengcang' into busUser
# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
#	api-admin/src/main/java/com/glxp/api/admin/entity/inout/OrderEntity.java
#	api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml
#	api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
#	api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
3 years ago
anthonyywj2 7edfb142bc 单据复制一二次复核 3 years ago
anthonyywj2 76a6e63620 自助平台代码合并 3 years ago
anthonyywj2 f1e7f2e00e Merge remote-tracking branch 'origin/fengcang' into fengcang 3 years ago
anthonyywj2 6e1edf5131 新增单据打印备注字段 3 years ago
anthonyywj2 a11ac74a4c 切换分支备份 3 years ago
anthonyywj2 09557b6a0f Merge branch 'fengcang' into busUser
# Conflicts:
#	api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml
#	api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
#	api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml
3 years ago
anthonyywj2 dfe651487c 单据添加部门 3 years ago
anthonyywj2 461691fb5e 备份 3 years ago