 anthonyywj2
|
d7dea46975
|
Merge branch 'fencang' into busUser
|
3 years ago |
|
anthonyywj2
|
bfdfb6cc13
|
单据类型新加单据复制是否需要一二次复核等
|
3 years ago |
|
anthonyywj2
|
c290ff9adf
|
切换分支备份
|
3 years ago |
|
anthonyywj2
|
5f4bf645de
|
Merge branch 'fencang' into busUser
# Conflicts:
# api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java
# api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
# api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
|
3 years ago |
|
anthonyywj2
|
fcecc7ea7b
|
切换分支备份
|
3 years ago |
|
anthonyywj2
|
ce76854d54
|
切换分支备份
|
3 years ago |
|
anthonyywj2
|
232507325c
|
单据添加部门
|
3 years ago |
|
anthonyywj2
|
304a2dae5d
|
Merge branch 'fencang' into busUser
# Conflicts:
# api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderPrintEntity.java
# api-admin/src/main/resources/application-dev.properties
# api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
# api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml
|
3 years ago |
|
anthonyywj2
|
cc32b68269
|
单据添加部门
|
3 years ago |
|
anthonyywj2
|
776a425e56
|
打印新增部门
|
3 years ago |
|
anthonyywj2
|
9965283479
|
打印新增部门
|
3 years ago |
|
anthonyywj2
|
882dc7cc76
|
流向加单据类型名称，新增产品审核后自动添加到耗材字典
|
3 years ago |
x_z
|
44bdc2c95c
|
1.检查产品，添加第三方系统标识
|
3 years ago |
|
anthonyywj2
|
9b5509450e
|
流向加单据类型名称，新增产品审核后自动添加到耗材字典
|
3 years ago |
|
anthonyywj2
|
4015080a5d
|
bug修改
|
3 years ago |
|
anthonyywj2
|
7a2c66b110
|
bug修改
|
3 years ago |
|
anthonyywj2
|
ed9a263abf
|
库存插入问题
|
3 years ago |
|
anthonyywj2
|
203425813c
|
代码备份
|
3 years ago |
|
anthonyywj2
|
38282debf7
|
不通分库不通用户对应单据类型问题
|
3 years ago |
|
anthonyywj2
|
9bd0f07ef8
|
Merge branch 'fencang' into busUser
# Conflicts:
# api-admin/src/main/resources/application-dev.properties
# api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
|
3 years ago |
|
anthonyywj2
|
c632b545f3
|
bug修改,单据补单未添加仓库号问题
|
3 years ago |
|
anthonyywj2
|
8ae35da561
|
预验收单据删除bug
|
3 years ago |
|
anthonyywj2
|
aa96e0be18
|
用户关联单据类型bug，以及同步问题，部门同步问题
|
3 years ago |
|
anthonyywj2
|
e5a9fddd61
|
Merge branch 'fencang' into busUser
|
3 years ago |
|
x_z
|
a27c44dd01
|
1.修复库存统计未添加分库条件的问题
|
3 years ago |
|
anthonyywj2
|
0c14fc6ac6
|
分仓分支合并到用户部门分支
|
3 years ago |
|
x_z
|
6c2a4a333b
|
1.码表添加实际数量
|
3 years ago |
|
x_z
|
4d9d81ce92
|
Merge remote-tracking branch 'origin/fencang' into fencang
|
3 years ago |
|
x_z
|
74920eeb0e
|
1.临时码表添加实际数量字段
|
3 years ago |
|
anthonyywj2
|
dd8a1c49c7
|
新增单据同步时同时同步业务单据详情信息
|
3 years ago |
|
x_z
|
566a8d0aec
|
1.是否可以补单判断增加单据类型平衡补单有无值判断
2.修复删除分库有无用户判断错误问题
|
3 years ago |
|
anthonyywj2
|
17efd70026
|
代码备份
|
3 years ago |
|
x_z
|
dd290f5f7e
|
1.单据打印实体增加分库字段
2.修复分页bug
|
3 years ago |
|
anthonyywj2
|
80adb05c93
|
代码备份
|
3 years ago |
|
x_z
|
902a2d1d6a
|
1.修复接口查询错误等问题
|
3 years ago |
|
anthonyywj2
|
945956f92f
|
试一试？
|
3 years ago |
|
anthonyywj2
|
a3ab86754c
|
切换分支备份
|
3 years ago |
|
anthonyywj2
|
fe4c476a49
|
新增部门，单据类型关联用户，代码备份
|
3 years ago |
|
x_z
|
c4a612344a
|
1.修复bug
|
3 years ago |
|
x_z
|
26a7617dec
|
1.分仓绑定的用户和单据类型添加分页查询功能
|
3 years ago |
|
anthonyywj2
|
52373a40ac
|
bug修改
|
3 years ago |
|
x_z
|
d5e3baed7b
|
1.修改第三方系统启用状态时校验必须启用一个第三方系统
|
3 years ago |
|
anthonyywj2
|
e5c95acbfb
|
Merge remote-tracking branch 'origin/fencang' into fencang
|
3 years ago |
|
anthonyywj2
|
16a6b0445f
|
库存产品信息新增更新时间，按时间排序
|
3 years ago |
|
x_z
|
47bbfbaf89
|
1.单据删除，删除预验收库库存
|
3 years ago |
|
anthonyywj2
|
df7d724d14
|
bug修改
|
3 years ago |
|
anthonyywj2
|
d062dddb72
|
单据复核，单据详情排序问题
|
3 years ago |
|
anthonyywj2
|
522ba15be2
|
单据打印排序修改，单据打印数量问题，之前修改备份
|
3 years ago |
|
x_z
|
edc6870a15
|
1.修改角色名称模糊查询
|
3 years ago |
|
x_z
|
b3a419db6b
|
1.删除第三方仓库，校验分仓数量
|
3 years ago |
|
x_z
|
f311b8c730
|
1.查询分库增加主仓库名称字段
2.修复第三方单据类型查询报错问题
|
3 years ago |
|
anthonyywj2
|
28ed79c4a1
|
新增第三方仓库关联分库等功能。。。
|
3 years ago |
|
x_z
|
388d09c9cf
|
1.调整预验收库产品信息批次号为空时的查询逻辑
|
3 years ago |
|
x_z
|
3604a30d54
|
1.补录单据查询接口返回当前仓库和分库名称，查询语句增加相关字段
|
3 years ago |
|
x_z
|
737b0462ff
|
1.修复平衡补单在未完成二次验收的情况下就补单的问题，调整查询语句，精简非必要字段，合并多次查询
|
3 years ago |
|
anthonyywj2
|
2c6d1f9874
|
供应商修改价格问题。单据类型显示问题
|
3 years ago |
|
anthonyywj2
|
c27ecfce06
|
业务单据，扫码单据返回仓库单据类型名称
|
3 years ago |
|
anthonyywj2
|
c7f31fa4b1
|
UDI码流向查询修改
|
3 years ago |
|
anthonyywj2
|
87b1084d2b
|
产品信息新增商品名称，打印修改，产品信息多个字段可自行维护
|
3 years ago |
|
anthonyywj2
|
5260230999
|
单据打印新增批次号打印，清单打印，解决服务端打印时出现乱码下划线问题
|
3 years ago |
|
anthonyywj2
|
3e8033f9f2
|
Merge remote-tracking branch 'origin/fencang' into fencang
|
3 years ago |
|
anthonyywj2
|
f4f1434281
|
单据打印新增批次号打印，清单打印，解决服务端打印时出现乱码下划线问题
|
3 years ago |
|
x_z
|
e5407f7e1c
|
1.单据删除逻辑调整，单据未验收时，删除临时码表数据
|
3 years ago |
|
anthonyywj2
|
f6bbfd17da
|
单据打印新增产品描述，商品名称字段
|
3 years ago |
|
anthonyywj2
|
5ebeb79716
|
业务单据打印新增商品名称字段
|
3 years ago |
|
x_z
|
254cfdea9e
|
1.修复预验收库存查询，分仓关联条件错误问题
|
3 years ago |
|
anthonyywj2
|
b8c4fe84da
|
新增扫码单据时无序列号可以直接输入数量，业务单据新增加入分库
|
3 years ago |
|
anthonyywj2
|
7f433048d5
|
bug修改
|
3 years ago |
|
anthonyywj2
|
b366783407
|
委托验收创建多个会覆盖问题，增加可以设置多个委托验收，选择业务单据检验加当前仓库当前分库校验
|
3 years ago |
|
anthonyywj2
|
6a1fd1ead9
|
单据类型设置默认补单仓库问题
|
3 years ago |
|
anthonyywj2
|
09217e3e32
|
库存，预验收等bug修改
|
3 years ago |
|
x_z
|
c371891881
|
1.修改错误表名
|
3 years ago |
|
x_z
|
ef8863ca17
|
1.新增单据添加分仓参数校验
2.委托验收响应结果添加分仓字段显示，添加相关查询方法
|
3 years ago |
|
anthonyywj2
|
a5df42540e
|
禅道上bug修改
|
3 years ago |
|
x_z
|
7c2dff03a6
|
1.删除分库检查是否有库存，有库存不删除
2.添加分库时，检查名称重复
|
3 years ago |
|
anthonyywj2
|
549f07785e
|
Merge remote-tracking branch 'origin/fencang' into fencang
|
3 years ago |
|
anthonyywj2
|
3e03e70a0a
|
未验收单据单据缺漏看不到问题
|
3 years ago |
|
x_z
|
6b1690ec2e
|
1.添加缺失查询条件，部分字段修改为模糊查询
|
3 years ago |
|
x_z
|
2996fbaee7
|
1.预验收库存查询，规格型号字段修改为模糊查询
|
3 years ago |
|
x_z
|
7f2b4284a2
|
1.分仓查询用户，添加非禁用条件
|
3 years ago |
|
anthonyywj2
|
fbe63e94a6
|
同步，单据复制，业务单据编辑等bug修复
|
3 years ago |
|
anthonyywj2
|
6806ad77c2
|
中继服务同步问题，排序问题
|
3 years ago |
|
anthonyywj2
|
8697028d06
|
中继服务同步问题，分库bug修复
|
3 years ago |
|
anthonyywj2
|
664b4c47e3
|
Merge branch 'master' into fencang
|
3 years ago |
|
anthonyywj2
|
b36eb1ce2f
|
分库功能完善
|
3 years ago |
|
anthonyywj2
|
6c73c4aa08
|
序列号修改问题
|
3 years ago |
|
anthonyywj2
|
20d6b4a5e7
|
切换分支本地暂时提交
|
3 years ago |
|
x_z
|
f5bc84f93a
|
1.修改sql条件拼接错误问题
|
3 years ago |
|
x_z
|
a4c372863b
|
1.修复第三方往来单位名称查询无效问题
|
3 years ago |
|
x_z
|
89498b5e2d
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
x_z
|
dd68585799
|
1.修改全局异常处理，打印错误代码位置
2.调整注册接口查询验证码报错问题
3.查询医疗器械信息SQL修改，修复关联查询未指定指定字段导致的查询失败问题
|
3 years ago |
|
anthonyywj2
|
f03891fd4a
|
同步设置
|
3 years ago |
|
x_z
|
8d3c080f34
|
1.产品信息增加修改时间字段
|
3 years ago |
|
anthonyywj2
|
f402e07d77
|
bug修改
|
3 years ago |
|
anthonyywj2
|
6d0ab1fa36
|
单据删除
|
3 years ago |
|
anthonyywj2
|
86f5684d54
|
界面修改
|
3 years ago |
|
anthonyywj2
|
11de396b84
|
库存查询，库存详情，参数配置等
|
3 years ago |
|
x_z
|
b3dea8a1ec
|
1.调整pom文件项目编译jdk版本，删除无用插件
2.下载记录实体类增加taskId 任务ID字段
|
3 years ago |
|
anthonyywj2
|
bb04ec954a
|
库存单据类型等修改，同步设置修改
|
3 years ago |
|
anthonyywj2
|
d298bf5b74
|
新增委托验收同步
|
3 years ago |
