添加取消定位时，入库头表和入库明细的状态回滚

mahuandong
1 parent 04766697
Showing 4 changed files with 14 additions and 7 deletions
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java
src/main/resources/templates/receipt/receiving/receiving.html
@@ -162,11 +162,11 @@ public class ReceiptContainerHeaderController extends BaseController {
     }
  
     /**
-     * 定位
+     * 取消定位
      */
     @RequiresPermissions("receipt:receiptContainer:canalPosition")
     @Log(title = "入库-取消定位", operating = "取消定位", action = BusinessType.OTHER)
-    @PostMapping( "/canalPosition")
+    @PostMapping( "/cancelPosition")
     @ResponseBody
     public AjaxResult cancelPosition(String ids){
         if (StringUtils.isEmpty(ids)){
@@ -253,7 +253,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
             }
         }
  
-        //从数据子典中获取单据当前状态
+        //从数据字典中获取单据当前状态
         List<DictData> dictData = dictDataService.selectDictDataByType("receiptHeaderStatus");
         for (int i = 0; i<dictData.size(); i++){
             if (dictData.get(i).getDictValue().equals(minStatus)){
@@ -170,7 +170,7 @@ public class ReceivingService {
     @Transactional
     public AjaxResult cancelPosition(ReceiptContainerDetail receiptContainerDetail){
         //查询入库组盘头
-        ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptDetailId());
+        ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(receiptContainerDetail.getReceiptContainerId());
         if (!(receiptContainerHeader.getStatus() == 0)){
             throw new ServiceException("组盘已生成任务不能取消定位");
         }
@@ -179,6 +179,7 @@ public class ReceivingService {
         if (!receiptContainerHeaderService.updateById(receiptContainerHeader)){
             throw new ServiceException("回滚入库组盘头失败");
         }
+
         LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
         lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, receiptContainerDetail.getReceiptContainerId());
         List<ReceiptContainerDetail> receiptContainerDetailList = receiptContainerDetailService.list(lambdaQueryWrapper);
@@ -189,9 +190,15 @@ public class ReceivingService {
             }
         }
  
-        LambdaQueryWrapper<ReceiptDetail> receiptDetailLambda = Wrappers.lambdaQuery();
+        //回滚入库明细状态
         ReceiptDetail receiptDetail = receiptDetailService.getById(receiptContainerDetail.getReceiptDetailId());
         receiptDetail.setProcessStamp("240");
-        return AjaxResult.success("");
+        if ( !receiptDetailService.updateById(receiptDetail)){
+            throw new ServiceException("回滚入库明细状态失败");
+        }
+
+        receiptDetailService.updateReceiptHeaderLastStatus(receiptDetail.getReceiptId());
+
+        return AjaxResult.success("取消定位成功");
     }
 }
@@ -411,7 +411,7 @@
 			$.modal.alertWarning("请至少选择一条记录");
 			return;
 		}
-		var url = ctx+"receipt/receiptContainerHeader/cancelPositioning";
+		var url = ctx+"receipt/receiptContainerHeader/cancelPosition";
 		var ids = "";
 		for (var i = 0; i<rows.length; i++){
 			ids += rows[i].receiptContainerId;