修复:扫码单据删除,内部单据选择仓库信息等问题

master
anthonyywj2 3 years ago
parent b1f14b710a
commit 9a2e03aeae

@ -14,6 +14,7 @@ import com.glxp.sale.admin.req.inout.OrderFilterRequest;
import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.PageSimpleResponse;
import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.res.basic.BussinessTypResponse;
import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.AuthAdminService;
import com.glxp.sale.admin.service.basic.BussinessLocalTypeService;
import com.glxp.sale.admin.service.basic.BussinessTypeService; import com.glxp.sale.admin.service.basic.BussinessTypeService;
import com.glxp.sale.admin.service.inout.OrderService; import com.glxp.sale.admin.service.inout.OrderService;
import com.glxp.sale.admin.util.CustomUtil; import com.glxp.sale.admin.util.CustomUtil;
@ -46,6 +47,8 @@ public class BussinessTypeController {
@Resource @Resource
private BussinessTypeService bussinessTypeService; private BussinessTypeService bussinessTypeService;
@Resource @Resource
private BussinessLocalTypeService bussinessLocalTypeService;
@Resource
private AuthAdminService authAdminService; private AuthAdminService authAdminService;
@Resource @Resource
private OrderService orderService; private OrderService orderService;
@ -107,11 +110,11 @@ public class BussinessTypeController {
if (orderEntity != null) { if (orderEntity != null) {
return ResultVOUtils.error(500, "已存在该类型扫码单据,无法删除!"); return ResultVOUtils.error(500, "已存在该类型扫码单据,无法删除!");
} }
if (bussinessTypeEntity.getLocalAction() != null && !"".equals(bussinessTypeEntity.getLocalAction())) {
BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction());
if (bussinessLocalTypeEntity != null && !"".equals(bussinessLocalTypeEntity)) {
return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型,无法删除!"); return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型,无法删除!");
} }
bussinessTypeService.deleteById(id); bussinessTypeService.deleteById(id);
return ResultVOUtils.success("删除成功"); return ResultVOUtils.success("删除成功");
} }

Loading…
Cancel
Save