From 3868b706ee3ee115a400d77abc3b69b83ea448c7 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 03 Sep 2021 14:15:36 +0800
Subject: [PATCH] bug123
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 45 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 44 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index e41ca60..8c82ce0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -14,7 +14,11 @@
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
+import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.constance.AppConstance;
+import com.matrix.system.common.dao.BusParameterSettingsDao;
+import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
@@ -29,6 +33,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -441,6 +446,25 @@
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "成功");
}
+ @Autowired
+ private SysCompanyDao sysCompanyDao;
+
+ /**
+ * 服务单打印
+ */
+ @RequestMapping(value = "/printOrder")
+ public @ResponseBody
+ ModelAndView printOrder() throws GlobleException {
+ ModelAndView mv = new ModelAndView("admin/hive/beautySalon/print-service");
+ SysUsers user=(SysUsers)WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ String comRegisterCode = sysCompanyDao.selectById(user.getCompanyId()).getComRegisterCode();
+ if(StringUtils.isNotBlank(comRegisterCode)){
+ mv.addObject("page",comRegisterCode);
+ }else {
+ mv.addObject("page","taiyan");
+ }
+ return mv;
+ }
/**
* 根据id对服务单进行派单
@@ -457,6 +481,8 @@
}
}
+ @Autowired
+ BusParameterSettingsDao busParameterSettingsDao;
/**
* 根据id取消预约
@@ -464,6 +490,24 @@
@RequestMapping(value = "/cancelOrder")
public @ResponseBody
AjaxResult cancelOrder(SysProjServices services) {
+
+ SysProjServices checkProjServices = sysProjServicesDao.selectById(services.getId());
+ BusParameterSettings shopManageAbleCancelDfkOrder = busParameterSettingsDao.selectCompanyParamByCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER, checkProjServices.getCompanyId());
+ if (StringUtils.isNotBlank(shopManageAbleCancelDfkOrder.getParamValue())
+ && shopManageAbleCancelDfkOrder.getParamValue().equals(Dictionary.FLAG_YES)) {
+ if (!checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DYY)
+ && !checkProjServices.getState().equals(Dictionary.SERVICE_STATU_DQR)) {
+ return new AjaxResult(AjaxResult.STATUS_FAIL, "您只能取消待预约订单");
+ }
+ }
+ return erpCancelOrder(services);
+ }
+ /**
+ * 根据id取消预约
+ */
+ @RequestMapping(value = "/erpCancelOrder")
+ public @ResponseBody
+ AjaxResult erpCancelOrder(SysProjServices services) {
int i = sysProjServicesService.modifyCancelProjServices(services);
if (i > 0) {
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "取消预约成功");
@@ -471,7 +515,6 @@
return new AjaxResult(AjaxResult.STATUS_FAIL, "取消预约失败");
}
}
-
/**
* 设置服务单划扣成功
--
Gitblit v1.9.1