diff --git a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java index fa1ae50..624a298 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java +++ b/src/main/java/com/gaotao/modules/shopOrder/controller/ShopOrderController.java @@ -2,6 +2,7 @@ package com.gaotao.modules.shopOrder.controller; import com.gaotao.common.utils.R; import com.gaotao.modules.pda.utils.ResponseData; +import com.gaotao.modules.schedule.data.SearchScheduleData; import com.gaotao.modules.shopOrder.entity.*; import com.gaotao.modules.shopOrder.service.ShopOrderService; import org.springframework.beans.factory.annotation.Autowired; @@ -339,4 +340,19 @@ public class ShopOrderController { List soBomList = shopOrderService.getShopOrderSapSOBOM(shopOrderData); return R.ok().put("soBomList",soBomList); } + + /** + * TODO 取消派工单信息 + * @author LR + * @date 2022/5/30 14:05 + * @Param [inData] + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "cancelShopOrderBun") + public R cancelShopOrderBun(@RequestBody SearchScheduleData inData){ + shopOrderService.cancelShopOrderBun(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!"); + } } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java index ad2b492..6ae314d 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/Impl/ShopOrderServiceImpl.java @@ -1,17 +1,24 @@ package com.gaotao.modules.shopOrder.service.Impl; +import com.gaotao.common.exception.XJException; import com.gaotao.modules.base.dao.BaseMapper; import com.gaotao.modules.base.entity.AccessSiteData; import com.gaotao.modules.base.entity.SiteData; import com.gaotao.modules.pda.utils.ResponseData; +import com.gaotao.modules.schedule.data.SearchScheduleData; +import com.gaotao.modules.schedule.mapper.ProcedureMapper; import com.gaotao.modules.shopOrder.entity.*; import com.gaotao.modules.shopOrder.dao.ShopOrderMapper; import com.gaotao.modules.shopOrder.service.ShopOrderService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; +import java.util.Map; + @Service public class ShopOrderServiceImpl implements ShopOrderService { @Autowired @@ -19,6 +26,8 @@ public class ShopOrderServiceImpl implements ShopOrderService { @Autowired private ShopOrderMapper shopOrderMapper; + @Autowired + private ProcedureMapper procedureMapper; //=============生产订单类型=================== @Override @@ -213,4 +222,39 @@ public class ShopOrderServiceImpl implements ShopOrderService { public ShopOrderData getOrderInfo(ShopOrderData shopOrderData) { return shopOrderMapper.getOrderInfo(shopOrderData); } + + @Override + @Transactional + public void cancelShopOrderBun(SearchScheduleData inData) { + //公共参数 + String site = inData.getSite(); + String orderNo = inData.getOrderNo(); + String status = inData.getStatus(); + //调用存储过程 执行取消订单的操作 + Map resultMap = this.cancelShopOrder(site, orderNo, status); + //判断是否检验成功 + String resultCode = String.valueOf(resultMap.get("resultCode")); + if (!"200".equalsIgnoreCase(resultCode)) { + String msg = String.valueOf(resultMap.get("resultMsg")); + throw new XJException(msg, Integer.parseInt(resultCode)); + } + } + + /** + * TODO 执行取消订单的操作 + * @author LR + * @date 2022/5/30 14:13 + * @Param [site, orderNo, status] + * @return void + **/ + public Map cancelShopOrder(String site, String orderNo, String status) { + List params = new ArrayList<>(); + params.add(site); + params.add(orderNo); + params.add(status); + //调用存储过程 + List> resultList = procedureMapper.getProcedureData("cancelShopOrder", params); + //处理返回的结果 + return resultList.get(0); + } } diff --git a/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java b/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java index 05ea287..9541e8f 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java +++ b/src/main/java/com/gaotao/modules/shopOrder/service/ShopOrderService.java @@ -1,6 +1,7 @@ package com.gaotao.modules.shopOrder.service; import com.gaotao.modules.pda.utils.ResponseData; +import com.gaotao.modules.schedule.data.SearchScheduleData; import com.gaotao.modules.shopOrder.entity.*; import java.util.List; @@ -195,4 +196,13 @@ public interface ShopOrderService { * @return **/ ShopOrderData getOrderInfo(ShopOrderData shopOrderData); + + /** + * TODO 取消派工单信息 + * @author LR + * @date 2022/5/30 14:06 + * @Param [inData] + * @return void + **/ + void cancelShopOrderBun(SearchScheduleData inData); }