修改任务审批时出现重复字段

src/main/java/com/dreamchaser/depository_manage/controller/PageController.java

@@ -1950,6 +1950,7 @@ public class PageController {
         // 计量单位
         StringBuilder sumUnit = new StringBuilder();
         List<Integer> depositoryIdList = new ArrayList<>();
+        List<Integer> placeIdList = new ArrayList<>();
         for (ApplicationOutRecordMinP applicationOutRecordMin : applicationOutRecordMinByParent) {
             // 获取子订单信息
             // 获取出库物料信息
@@ -1959,14 +1960,9 @@ public class PageController {
             if(!depositoryIdList.contains(depositoryId)){
                 depositoryIdList.add(depositoryId);
             }
-            // 获取出库库位
-            Place placeById = placeService.findPlaceById(applicationOutRecordMin.getPlaceId());
-            if (placeById != null) {
-                if ("0000".equals(placeById.getCode())) {
-                    placeCode.append("默认库位").append(",");
-                } else {
-                    placeCode.append(placeById.getCode()).append(",");
-                }
+            Integer placeId = applicationOutRecordMin.getPlaceId();
+            if(!placeIdList.contains(placeId)){
+                placeIdList.add(placeId);
             }
             applicationOutRecordMin.setMname(inventoryById.getMname());
             sumQuantity += applicationOutRecordMin.getQuantity();
@@ -2032,6 +2028,18 @@ public class PageController {
              ) {
             depositoryName.append(depository.getDname()).append(",");
         }
+
+        List<Place> placeByIdS = placeService.findPlaceByIdS(placeIdList);
+        for (Place placeById : placeByIdS) {
+            // 获取出库库位
+            if (placeById != null) {
+                if ("0000".equals(placeById.getCode())) {
+                    placeCode.append("默认库位").append(",");
+                } else {
+                    placeCode.append(placeById.getCode()).append(",");
+                }
+            }
+        }
         recordP.setPCode(placeCode.toString());
         recordP.setApplicantTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getApplicantTime())));
         recordP.setDepartmentheadTime(DateUtil.TimeStampToDateTime(Long.valueOf(recordP.getDepartmentheadTime())));

src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java

@@ -17,6 +17,7 @@ import com.dreamchaser.depository_manage.service.DepositoryRecordService;
 import com.dreamchaser.depository_manage.service.RoleService;
 import com.dreamchaser.depository_manage.service.SplitUnitService;
 import com.dreamchaser.depository_manage.utils.*;
+import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,7 @@ import java.util.concurrent.*;
  * @author Dreamchaser
  */
 @Service
+@Slf4j
 public class DepositoryRecordServiceImpl implements DepositoryRecordService {
     @Autowired
     private DepositoryRecordMapper depositoryRecordMapper;
@@ -2174,7 +2176,6 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
      */
     @Override
     public Integer reviewByQyWxApprovalOut(String mainId, ApprovalInfo_Details approvalInfo_details, String userAgent, String spStatus, String spNo, boolean flagForFirst, int flagForDepository) {
-
         if (flagForDepository == 3) {
             // 如果是仓库管理员审批，直接返回
             return 0;
@@ -2198,6 +2199,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         Integer outId = ObjectFormatUtil.toInteger(mainId);
         // 获取对应的出库订单
         ApplicationOutRecord recordP = depositoryRecordMapper.findApplicationOutRecordPById(outId);
+
         // 获取当前出库的仓库是否为开放仓库
         int flagForOpenDepository = recordP.getFlagForOpenDepository();
         if (!flagForFirst) {
@@ -2419,7 +2421,8 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
                 // 将当前redis中存储的spno删除
                 redisPool.getRedisTemplateByDb(14).delete("wms_QyWxMessage_" + spNo);
             }
-        } else {
+        }
+        else {
             // 如果是部门负责人
 
             String departmentheadTime = recordP.getDepartmentheadTime();
@@ -2473,6 +2476,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService {
         if (flag) {
             return 1;
         }
+        log.info("出库审批参数 “flagForFirst:"+flagForFirst+"”，“flagForDepository："+flagForDepository+"”，审批人："+userByPort.getNumber()+userByPort.getName());
         map.put("id", outId);
         return depositoryRecordMapper.updateApplicationOutRecord(map);