Commit Graph

102 Commits (873cfba0c07048fda94bbd3a0aeb2a133b74f881)

Author SHA1 Message Date
anthonyywj2 873cfba0c0 bug修改,代码备份 3 years ago
x_z 37c9d2d6aa 1.添加进口产品代理商字段
2.新增查询用户关联单据类型接口
3 years ago
x_z 0fc5dcb63c 1.单据实体类增加三期校验字段 3 years ago
anthonyywj2 cedb87b620 UDI同步库查询i优化 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 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
anthonyywj2 9b5509450e 流向加单据类型名称,新增产品审核后自动添加到耗材字典 3 years ago
anthonyywj2 7a2c66b110 bug修改 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 e5a9fddd61 Merge branch 'fencang' into busUser 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
x_z dd290f5f7e 1.单据打印实体增加分库字段
2.修复分页bug
3 years ago
anthonyywj2 80adb05c93 代码备份 3 years ago
x_z 902a2d1d6a 1.修复接口查询错误等问题 3 years ago
anthonyywj2 fe4c476a49 新增部门,单据类型关联用户,代码备份 3 years ago
anthonyywj2 d062dddb72 单据复核,单据详情排序问题 3 years ago
anthonyywj2 522ba15be2 单据打印排序修改,单据打印数量问题,之前修改备份 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
anthonyywj2 b8c4fe84da 新增扫码单据时无序列号可以直接输入数量,业务单据新增加入分库 3 years ago
anthonyywj2 7f433048d5 bug修改 3 years ago
anthonyywj2 3e03e70a0a 未验收单据单据缺漏看不到问题 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