Commit Graph

542 Commits (ww)
 

Author SHA1 Message Date
anthonyywj2 b898849d8a Merge remote-tracking branch 'origin/busUser' into busUser 3 years ago
x_z 1e9e3b4a0a 1.编辑条码增加数据校验,修复数量小于1时可以提交的问题 3 years ago
x_z ba850eb92a 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 f1e7f2e00e Merge remote-tracking branch 'origin/fengcang' into fengcang 3 years ago
anthonyywj2 6e1edf5131 新增单据打印备注字段 3 years ago
anthonyywj2 a11ac74a4c 切换分支备份 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 dfe651487c 单据添加部门 3 years ago
anthonyywj2 461691fb5e 备份 3 years ago
x_z 334f91ecfb 1.修复菜单数据返回状态值丢失问题 3 years ago
anthonyywj2 6c3eb81fdb bug修改 3 years ago
anthonyywj2 c088c32e37 自动下载,或手动下载第三方产品信息,自动导入到耗材字典 3 years ago
anthonyywj2 b1c8d95d61 打印新增部门 3 years ago
anthonyywj2 fef9a9707c 切换分支备份 3 years ago
anthonyywj2 2f31ac1423 备份 3 years ago
x_z 6a283d9a07 1.修改DI查询条件,多级包装的DI均可查询数据 3 years ago
anthonyywj2 a332175496 bug修改 3 years ago
x_z 546e546f56 1.修复单据日期查询问题
2.检查产品是否存在,添加第三方系统标识条件
3 years ago
anthonyywj2 3393944f93 bug修改 3 years ago
x_z 1a9dcb3c9b 1.修复预验收库库存查询问题
2.修复分页失败问题
3.UDI码流向查询添加时间排序
3 years ago
anthonyywj2 6227f8dfd1 库存插入问题 3 years ago
anthonyywj2 f291d47863 代码备份 3 years ago
x_z b0bf4a0d10 1.库存统计增加批次号分组 3 years ago
x_z 9339ac4f8f 1.部分接口添加数据重复校验
2.修复部分sql模糊查询写法错误导致无数据问题
3 years ago
anthonyywj2 909194a54b Merge branch 'fengcang' into busUser
# Conflicts:
#	api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml
3 years ago
anthonyywj2 454180ccbe 备份 3 years ago
anthonyywj2 8e827f5032 bug修改 3 years ago
anthonyywj2 fc6f5ff488 bug修改,单据补单未添加仓库号问题 3 years ago
anthonyywj2 1577c191d4 bug修改 3 years ago
anthonyywj2 211ba9eef6 自助平台bug修复同步(二级bug修复) 3 years ago
anthonyywj2 dd88f1905a 预验收单据删除bug 3 years ago
anthonyywj2 628f3bccee 单据删除问题,批次号大小写不匹配问题 3 years ago
anthonyywj2 77297f5d0f 用户关联单据类型bug,以及同步问题,部门同步问题 3 years ago
anthonyywj2 cff8e2ce24 Merge branch 'fengcang' into busUser 3 years ago
x_z f097bd9674 1.修复库存统计未添加分库条件的问题 3 years ago
anthonyywj2 209a9bec7d Merge branch 'fengcang' into busUser 3 years ago
anthonyywj2 e7427bc1d9 新增部门,修改,代码备份 3 years ago
x_z 8be5da50d6 1.码表添加实际数量
2.码详情响应类数据添加单据ID字段
3 years ago
x_z eaa7229cc5 1.临时码表添加实际数量字段 3 years ago
anthonyywj2 71d1cf46d7 新增单据同步时同时同步业务单据详情信息 3 years ago
x_z 6441034775 1.是否可以补单判断增加单据类型平衡补单有无值判断
2.修复删除分库有无用户判断错误问题
3 years ago
anthonyywj2 49d109d559 代码备份 3 years ago
x_z 915014b5b9 1.单据打印实体增加分库字段 3 years ago
anthonyywj2 9272eaf564 新增单据上传时间控制 3 years ago
x_z a1b9309508 1.修复bug 3 years ago