wangwei
|
609b9e6bb6
|
更新定时删除任务
|
3 years ago |
郑明梁
|
77957dc94a
|
Merge remote-tracking branch 'origin/orderChange' into orderChange
# Conflicts:
# api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java
|
3 years ago |
|
郑明梁
|
b55295451f
|
同步管理系统busUser上的bug
|
3 years ago |
x_z
|
9856b83d4d
|
1.同步busUser分支的bug修复
|
3 years ago |
|
x_z
|
6e1a461a36
|
Merge remote-tracking branch 'origin/orderChange' into zhairh
|
3 years ago |
 anthonyywj2
|
fe3483f3bd
|
系统优化
|
3 years ago |
|
x_z
|
b932e8ff24
|
Merge remote-tracking branch 'origin/orderChange' into zhairh
# Conflicts:
# api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
|
3 years ago |
|
郑明梁
|
2c3d8de691
|
同步busUser上的bug
|
3 years ago |
|
x_z
|
1bee746e3b
|
Merge remote-tracking branch 'origin/orderChange' into zhairh
|
3 years ago |
|
anthonyywj2
|
78eede1aef
|
单据流转设置改动，采购管理优化，bug处理
|
3 years ago |
|
anthonyywj2
|
3b8e7b1972
|
切换分支代码备份
|
3 years ago |
|
x_z
|
1b47936969
|
Merge remote-tracking branch 'origin/busUser' into zhairh
|
3 years ago |
|
x_z
|
76ceab7a45
|
1.修复转单问题，条码添加供应商信息
|
3 years ago |
zhengmingliang
|
61248fc682
|
同步自助平台代码
|
3 years ago |
|
x_z
|
d0aa8e9412
|
Merge branch 'busUser' into zhairh
# Conflicts:
# api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java
# api-admin/src/main/resources/application-dev.properties
# api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
|
3 years ago |
|
x_z
|
26392dcbd7
|
1.添加上传单据到自助平台接口
2.往来单位类型添加医院客户类型
|
3 years ago |
|
anthonyywj2
|
f7e8306ba7
|
Merge branch 'busUser' into purchase
|
3 years ago |
|
anthonyywj2
|
34f975c5a1
|
首映功能完善，领用功能完善，采购管理完善
|
3 years ago |
|
x_z
|
e0b1b1839b
|
Merge remote-tracking branch 'origin/busUser' into zhairh
|
3 years ago |
|
x_z
|
6ee07ea460
|
1.保存代码
|
3 years ago |
|
x_z
|
7459c2ff43
|
1.添加盘点设置表及对应增改查接口和实体类
|
3 years ago |
|
anthonyywj2
|
d5a6e01714
|
首营功能完善
|
3 years ago |
|
x_z
|
eb300dec08
|
1.修改新增盘点相关接口
|
3 years ago |
|
x_z
|
f8fcfb6d84
|
1.添加盘点单据接口
|
3 years ago |
|
zhengmingliang
|
2a08b60f3b
|
修复判断导入对比bug
|
3 years ago |
|
anthonyywj2
|
3d22ec1593
|
产品关联写入多了个，
|
3 years ago |
|
anthonyywj2
|
9054f3f250
|
切换分支物资管理系统备份
|
3 years ago |
|
anthonyywj2
|
43c2b5a72e
|
代码同步，平和接口对接修改
|
3 years ago |
|
anthonyywj2
|
90a424dd12
|
国家库同步时报错
|
3 years ago |
|
anthonyywj2
|
80b19f4cea
|
新增第三方产品信息上传审核，中继服务同步问题，定时任务问题
|
3 years ago |
|
anthonyywj2
|
374cfda8aa
|
第三方服务bug修改！功能大改造取得阶段性胜利
|
3 years ago |
|
anthonyywj2
|
3306777722
|
业务单据回退代码copy
|
3 years ago |
|
x_z
|
90c25c2720
|
1.添加进口产品代理商字段
2.新增查询用户关联单据类型接口
|
3 years ago |
|
x_z
|
763f8e3338
|
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
|
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
|
fef9a9707c
|
切换分支备份
|
3 years ago |
|
x_z
|
546e546f56
|
1.修复单据日期查询问题
2.检查产品是否存在，添加第三方系统标识条件
|
3 years ago |
|
anthonyywj2
|
3393944f93
|
bug修改
|
3 years ago |
|
anthonyywj2
|
f291d47863
|
代码备份
|
3 years ago |
|
x_z
|
9339ac4f8f
|
1.部分接口添加数据重复校验
2.修复部分sql模糊查询写法错误导致无数据问题
|
3 years ago |
|
anthonyywj2
|
209a9bec7d
|
Merge branch 'fengcang' into busUser
|
3 years ago |
|
x_z
|
6441034775
|
1.是否可以补单判断增加单据类型平衡补单有无值判断
2.修复删除分库有无用户判断错误问题
|
3 years ago |
|
anthonyywj2
|
49d109d559
|
代码备份
|
3 years ago |
|
x_z
|
a1b9309508
|
1.修复bug
|
3 years ago |
|
x_z
|
2810beb4bd
|
1.修复查询单据类型错误问题
|
3 years ago |
