Commit Graph

417 Commits (989561cca652ebfa6ad86fcfeccb010aa5b5814a)
 

Author SHA1 Message Date
anthonyywj2 265dae837d Merge branch 'fencang' into busUser
# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/service/receipt/SyncUdiService.java
#	api-admin/src/main/resources/application-dev.properties
3 years ago
anthonyywj2 0eef8390f3 UDI同步库查询i优化 3 years ago
anthonyywj2 d7dea46975 Merge branch 'fencang' into busUser 3 years ago
anthonyywj2 bfdfb6cc13 单据类型新加单据复制是否需要一二次复核等 3 years ago
anthonyywj2 13e348f3bd Merge remote-tracking branch 'origin/fencang' into fencang 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
x_z dc40f86035 1.修复功能菜单返回数据状态值丢失问题 3 years ago
anthonyywj2 776a425e56 打印新增部门 3 years ago
anthonyywj2 9965283479 打印新增部门 3 years ago
anthonyywj2 223afa6f82 备份 3 years ago
anthonyywj2 882dc7cc76 流向加单据类型名称,新增产品审核后自动添加到耗材字典 3 years ago
x_z 44bdc2c95c 1.检查产品,添加第三方系统标识 3 years ago
anthonyywj2 9b5509450e 流向加单据类型名称,新增产品审核后自动添加到耗材字典 3 years ago
anthonyywj2 8f6b07e8a0 bug修改 3 years ago
anthonyywj2 4015080a5d bug修改 3 years ago
anthonyywj2 7a2c66b110 bug修改 3 years ago
x_z cefda56b75 1.修复查询预验收库库存问题 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
x_z 192faa5e78 1.修复时间转换失败问题
2.调整业务单据详情更新发票号等字段逻辑
3 years ago
anthonyywj2 74b9f98ee4 bug修改 3 years ago
anthonyywj2 c632b545f3 bug修改,单据补单未添加仓库号问题 3 years ago
anthonyywj2 8702fee6c8 二级bug修复 3 years ago
anthonyywj2 8ae35da561 预验收单据删除bug 3 years ago
anthonyywj2 fc0f37c183 单据删除问题,批次号大小写不匹配问题 3 years ago
anthonyywj2 bea1834a28 用户关联单据类型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
anthonyywj2 71a8a97053 代码备份 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
anthonyywj2 3b2b7057b2 Merge remote-tracking branch 'origin/fencang' into fencang 3 years ago
x_z 566a8d0aec 1.是否可以补单判断增加单据类型平衡补单有无值判断
2.修复删除分库有无用户判断错误问题
3 years ago
anthonyywj2 1ce70a97ce Merge remote-tracking branch 'origin/fencang' into fencang 3 years ago
anthonyywj2 17efd70026 代码备份 3 years ago
x_z dd290f5f7e 1.单据打印实体增加分库字段
2.修复分页bug
3 years ago
anthonyywj2 74f153f7e8 以使用入库不生效问题 3 years ago
anthonyywj2 a668a38fb6 以使用入库不生效问题 3 years ago