Commit Graph

437 Commits (dd6448c0b58007ad1a47bdedcf70feccab84386f)

Author SHA1 Message Date
anthonyywj2 3938126fe3 Merge remote-tracking branch 'origin/orderChange' into orderChange 3 years ago
郑明梁 7574c7fa9c 修改bug更换产品表实体类 3 years ago
郑明梁 40d9532e3e 更换产品表实体类 3 years ago
anthonyywj2 519c8e0431 切换分支提交 3 years ago
郑明梁 bdb69ec417 修改bug 3 years ago
anthonyywj2 20e64cab55 切换分支备份 3 years ago
郑明梁 fc53f09e94 Merge remote-tracking branch 'origin/orderChange' into orderChange
# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java
#	api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java
#	api-admin/src/main/resources/application-pro.properties
3 years ago
anthonyywj2 8eafd0cd4a 切换分支备份 3 years ago
郑明梁 ad87952171 修改bug 3 years ago
郑明梁 5aefa9c246 修改bug 3 years ago
anthonyywj2 49f603de59 缺量补单问题 3 years ago
anthonyywj2 0d747d74f8 备份 3 years ago
anthonyywj2 12fe7bc876 单据流转设置改动,采购管理优化,bug处理 3 years ago
zhengmingliang bb0a7ef67c 修改bug 3 years ago
zhengmingliang 8ddaccbff1 修改首营和供应商采购bug 3 years ago
zhengmingliang 14561bdbba 修改页面及功能bug 3 years ago
zhengmingliang edeb5a8701 修复bug 3 years ago
anthonyywj2 2b7dd28385 注册证号,审核人,审核时间修改 3 years ago
zhengmingliang 7f32d1b005 改单据功能选取单据类型问题 3 years ago
zhengmingliang 2c6e34c375 修改选入资质证书bug 3 years ago
zhengmingliang 2343aef55d 修改bug 3 years ago
zhengmingliang e2320881b2 去掉仓库关联单据验证问题 3 years ago
anthonyywj2 4c6dc5e448 首营资质同步问题,资质证书选择问题, 3 years ago
zhengmingliang 748055cf2d 改采购管理bug 3 years ago
anthonyywj2 1424110868 采购管理相关功能bug修改 3 years ago
anthonyywj2 ceac58b658 采购管理相关功能 3 years ago
anthonyywj2 0b632b4745 采购计划相关问题 3 years ago
anthonyywj2 1df7f30538 领用单据校验问题, 3 years ago
anthonyywj2 7c996be857 领用单据功能完善 3 years ago
zhengmingliang 9557bc96f4 修改拉取分库功能代码 3 years ago
zhengmingliang 4ab695be08 修复资质功能问题以及取消仓库功能代码更新 3 years ago
anthonyywj2 5f6351fc25 新增单据转换设置功能 3 years ago
anthonyywj2 ba3c9437bd 首营功能优化 3 years ago
zhengmingliang a57f0e5dd3 修复新用户审批无供应商自动创建 3 years ago
zhengmingliang 9f809c9db2 修复本企业产品选入产品去重判断 3 years ago
zhengmingliang 1e968bc0c5 修复仓库字典单据显示问题 3 years ago
anthonyywj2 d9084db91b 首营功能提交 3 years ago
zhengmingliang ba279f699d 修复补单默认仓库参数校验问题 3 years ago
zhengmingliang 2869abcd2c 修复用户注册和删除问题 3 years ago
zhengmingliang 22f86ca488 修改用户÷次登录选择仓库问题 3 years ago
zhengmingliang a1d32ae7e5 修改数据类型 3 years ago
anthonyywj2 0b6a80c0a7 customerId从Long型改为String型, 3 years ago
anthonyywj2 5214b9a136 customerId从Long型改为String型,首营管理代码新增 3 years ago
anthonyywj2 10c4fd2839 备份 3 years ago
anthonyywj2 b2a8e51340 DI查询问题优化(耗材字典和添加DI产品信息) 3 years ago
zhengmingliang 84ce4e33a9 修改bug 3 years ago
zhengmingliang 2cd80bbc0f Merge remote-tracking branch 'origin/busUser' into busUser 3 years ago
anthonyywj2 27daafa4d2 同步下载国家库多级包装问题 3 years ago
anthonyywj2 b153ee048c 修改平衡补单时,往来分库错误的问题 ,以及页面展示关联查询的问题 3 years ago
zhengmingliang 2282db5885 修改bug 3 years ago
anthonyywj2 dfbc69cfe6 审核系统繁忙问题 3 years ago
zhengmingliang 7edab2a758 Merge remote-tracking branch 'origin/busUser' into busUser 3 years ago
anthonyywj2 d9d07080d3 多个bug修改 3 years ago
zhengmingliang e4755736da 修改10月21号bug 3 years ago
anthonyywj2 37c7e83c79 多个bug修改 3 years ago
zhengmingliang 994519d036 修改 2022 10 19号bug 3 years ago
anthonyywj2 9bea70cd56 多个bug修改 3 years ago
anthonyywj2 9c6364e8c2 bug修改,耗材字典控制是否必填,委托验收bug,新增配送产品其他一些bug问题 3 years ago
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