Commit Graph

379 Commits (20e64cab55455e46b0a44c3db17d736787872a95)

Author SHA1 Message Date
anthonyywj2 9439249026 功能大改造取得阶段性胜利 3 years ago
anthonyywj2 13200bb936 回退逻辑修改,根据是否一次验收二次验收进行回退 3 years ago
anthonyywj2 c69486989e bug修改,回退单据逻辑修改 3 years ago
anthonyywj2 630faad352 动态添加产品信息参数信息 3 years ago
x_z f314bb1e7f 1.增加单据回退接口 3 years ago
anthonyywj2 873cfba0c0 bug修改,代码备份 3 years ago
x_z ac98238785 1.新增DI产品审核,添加产品 3 years ago
x_z 142a557e10 1.修复用户未关联单据类型时可查询出所有单据类型的问题 3 years ago
x_z 37c9d2d6aa 1.添加进口产品代理商字段
2.新增查询用户关联单据类型接口
3 years ago
x_z 3b294ba821 1.清理不需要的代码 3 years ago
x_z 1f7ba676d9 Merge remote-tracking branch 'origin/busUser' into busUser 3 years ago
x_z b1908c2f4c 1.取消仓库字典添加用户和单据类型列表的分页 3 years ago
anthonyywj2 92bc5df34e bug收尾 3 years ago
anthonyywj2 461cea3055 领用单据相关bug修改,第三方业务单据修改 3 years ago
anthonyywj2 e000e765c4 bug修改 3 years ago
x_z e9540c0167 1.修复库存统计报错问题
2.调整第三方系统添加单据类型检查重复判断逻辑
3 years ago
x_z 0fc5dcb63c 1.单据实体类增加三期校验字段 3 years ago
x_z 4bc21a1e0f 1.修复数据校验问题 3 years ago
anthonyywj2 cedb87b620 UDI同步库查询i优化 3 years ago
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
anthonyywj2 80adb05c93 代码备份 3 years ago
x_z 70c4d100b6 1.修复扫码单据详情数量计算错误问题 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
anthonyywj2 43f5f954e7 国家库DI更新下载最新版本 3 years ago
x_z 7250c03a4c 1.仓库添加关联用户和单据类型候选列表页添加分页功能 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 e9ab6fdfb1 1.移除多余字符 3 years ago
x_z 47bbfbaf89 1.单据删除,删除预验收库库存 3 years ago
anthonyywj2 df7d724d14 bug修改 3 years ago
anthonyywj2 eaec15dc88 委托验收设置修改变成新增问题,数据同步,同步信息详情修改 3 years ago
anthonyywj2 d062dddb72 单据复核,单据详情排序问题 3 years ago
anthonyywj2 d6abf1f6f6 单据复核少了序列号 3 years ago
anthonyywj2 522ba15be2 单据打印排序修改,单据打印数量问题,之前修改备份 3 years ago
x_z fa8cf2d5f5 1.添加UDIMS所需的仓库和分仓查询接口 3 years ago
x_z 4c0b0f354f 1.修复供应商选入产品信息报错无法选入问题 3 years ago
x_z edc6870a15 1.修改角色名称模糊查询 3 years ago
x_z b3a419db6b 1.删除第三方仓库,校验分仓数量 3 years ago
x_z bcf552d948 1.第三方单据类型查询增加分页逻辑 3 years ago
x_z f311b8c730 1.查询分库增加主仓库名称字段
2.修复第三方单据类型查询报错问题
3 years ago
anthonyywj2 28ed79c4a1 新增第三方仓库关联分库等功能。。。 3 years ago
anthonyywj2 012e1b866c 代码备份,业务单据提交,价格。等 3 years ago
anthonyywj2 95acd3c49e 诏安一般耗材无法打印问题,批次号问题 3 years ago
x_z 388d09c9cf 1.调整预验收库产品信息批次号为空时的查询逻辑 3 years ago