物资-领用退回历史

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/collect/controller/PsiCollectController.java

@@ -231,7 +231,7 @@ public class PsiCollectController {
      */
     @ApiOperation(value = "根据历史表id查询历史表数据")
     @GetMapping("/findHiByHiId")
-    public ResponseEntity findHiByHiId(@RequestParam String id) {
+    public ResponseEntity findHiByHiId(@RequestParam String id) throws Exception {
         PsiCollectDto hi = psiCollectService.findHiByHiId(id);
         return ResponseEntity.ok(hi);
     }

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/collect/domain/PsiCollectBasicsReturnHi.java

@@ -1,5 +1,6 @@
 package com.jeeplus.psimanage.collect.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -40,6 +41,7 @@ public class PsiCollectBasicsReturnHi extends BaseEntity {
     /**
      * 退回申请人名称
      */
+    @TableField(exist = false)
     private String returnUserName;
 
     private static final long serialVersionUID = 1L;

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/collect/service/PsiCollectService.java

@@ -985,6 +985,38 @@ public class PsiCollectService {
         // 将退回状态的数据全部撤回
         psiDetailedMapper.updateNoReturnByBasicId(id);
         psiDetailedMapper.updateAutditNoReturnByBasicId(id); // 修改退回状态
+        ;
+        PsiCollectBasicsReturnHi psiCollectBasicsReturnHi = returnHiMapper.selectOne(
+                new LambdaQueryWrapper<PsiCollectBasicsReturnHi>()
+                        .eq(PsiCollectBasicsReturnHi::getCollectId, id)
+                        .orderByDesc(PsiCollectBasicsReturnHi::getCreateTime)
+                        .last("limit 1")
+        );
+        PsiCollectDto psiCollectDto = new PsiCollectDto();
+        if (ObjectUtil.isNotEmpty(psiCollectBasicsReturnHi) && StringUtils.isNotBlank(psiCollectBasicsReturnHi.getJsonData())) {
+            psiCollectDto = JSON.parseObject(psiCollectBasicsReturnHi.getJsonData(), PsiCollectDto.class); // json字符串解析为java对象
+            for (PsiCollectDetailedRecord detailInfo : psiCollectDto.getRecordList()) {
+                if (StringUtils.isNotBlank(detailInfo.getId()) && StringUtils.isNotBlank(detailInfo.getIsReturn())) {
+                    //修改退回状态，退回数量
+                    detailInfo.setIsReturn("0");
+                    detailInfo.setSurplusStock("0");
+                    psiDetailedMapper.updateAuditReturnFlagById(detailInfo); // 修改退回状态
+                }
+            }
+        }else{
+            List<PsiCollectDetailedRecord> recordList = psiDetailedMapper.getRecordsByBasicId(id, "0");
+            for (PsiCollectDetailedRecord detailInfo : recordList) {
+                if (StringUtils.isNotBlank(detailInfo.getId()) && StringUtils.isNotBlank(detailInfo.getIsReturn())) {
+                    detailInfo.setNotSurplusStock(detailInfo.getCollectNumber());
+                    detailInfo.setSurplusStock("0");
+                    detailInfo.setReturnedNum("0");
+                    //修改退回状态，退回数量
+                    psiDetailedMapper.updateAuditReturnFlagById(detailInfo); // 修改退回状态
+                }
+            }
+        }
+
+
 
     }
 
@@ -995,7 +1027,7 @@ public class PsiCollectService {
     }
 
     // 根据历史表id查询历史表数据
-    public PsiCollectDto findHiByHiId(String hiId) {
+    public PsiCollectDto findHiByHiId(String hiId) throws Exception {
         PsiCollectDto psiCollectDto = new PsiCollectDto();
         PsiCollectBasicsReturnHi hiByHiId = returnHiMapper.findHiByHiId(hiId); // 根据历史表id查询历史表数据
         if (ObjectUtil.isNotEmpty(hiByHiId) && StringUtils.isNotBlank(hiByHiId.getJsonData())) {
@@ -1020,6 +1052,11 @@ public class PsiCollectService {
                         file.setCreateBy(SpringUtil.getBean ( IUserApi.class ).getById(file.getBy()));
                     });
                 }
+                //退回历史
+                List<PsiCollectDetailedRecord> recordList = psiCollectDto.getRecordList();
+                if(CollectionUtil.isNotEmpty(recordList)){
+                    psiCollectDto.setRecordList(recordList);
+                }
             }
 
         }