发货流程问题修复

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PreparationMoneyController.java

@@ -256,7 +256,7 @@ public class PreparationMoneyController extends BaseController {
 	@PostMapping(value = "/uploadVoucher")
 	@ApiOperation(httpMethod = "POST",value = "上传收获凭证",  notes = "上传收获凭证")
 	@GlobalTransactional
-	public ResponseModel uploadVoucher(@RequestParam(value = "instanceId",required = false) String instanceId,PreparationMoney model, String isSubmit) {
+	public ResponseModel uploadVoucher(@RequestParam(value = "instanceId",required = false) String instanceId,@RequestBody PreparationMoney model, String isSubmit) {
 
 		preparationMoneyServiceImpl.uploadVoucher(model,instanceId,isSubmit);
 		return CommonResponseNewUtil.success();

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -41,6 +42,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -566,7 +568,11 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             }
             up.in(PeasantHousehold::getSequenceNbr, idsH);
             preparationMoneyMapper.insert(model);
+            List<DocumentStation> ids = model.getPeasantHouseholdId();
             if (isSubmit.equals("0")) {
+                if (CollUtil.isEmpty(ids) && ids.isEmpty() ){
+                    throw new BadRequest("提交时选择电站不可为空");
+                }
                 up.set(PeasantHousehold::getPreparationMoneyState, ArrivalStateeEnum.待收货.getCode());
                 up.set(PeasantHousehold::getConstructionState, ArrivalStateeEnum.待收货.getCode());
                 //开启工作流 并执行一步
@@ -601,13 +607,15 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             peasantHouseholdMapper.update(null, up);
             preparationMoneyMapper.updateById(model);
             //电站信息存储
-            List<DocumentStation> ids = model.getPeasantHouseholdId();
+            if (CollectionUtil.isNotEmpty(ids) && ids.size()>0){
                 List<DocumentStation> listDocumentStation = new ArrayList<>();
                 for (DocumentStation documentStation : ids) {
                     documentStation.setPreparationMoneyId(model.getSequenceNbr());
                     listDocumentStation.add(documentStation);
                 }
                 documentStationService.saveBatch(listDocumentStation);
+            }
+
 
         } else {
             //获取经销商单位信息
@@ -638,9 +646,12 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
 
                 model.setConsigneeRegion(ConsigneeRegion);
             }
-
+            List<DocumentStation> ids = model.getPeasantHouseholdId();
             LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
             if (isSubmit.equals("0")) {
+                if (CollUtil.isEmpty(ids) && ids.isEmpty() ){
+                    throw new BadRequest("提交时选择电站不可为空");
+                }
                 //更新电站施工状态
                 up.set(PeasantHousehold::getPreparationMoneyState, DeliveryStateeEnum.已发货.getCode());
                 up.set(PeasantHousehold::getConstructionState, DeliveryStateeEnum.已发货.getCode());
@@ -680,15 +691,15 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
             up3.eq(DocumentStation::getPreparationMoneyId, model.getSequenceNbr());
             documentStationMapper.delete(up3);
 
-            List<DocumentStation> ids = model.getPeasantHouseholdId();
+
+            if (CollectionUtil.isNotEmpty(ids) && ids.size()>0){
                 List<DocumentStation> listDocumentStation = new ArrayList<>();
                 for (DocumentStation documentStation : ids) {
                     documentStation.setPreparationMoneyId(model.getSequenceNbr());
-                documentStation.setSequenceNbr(null);
                     listDocumentStation.add(documentStation);
                 }
-
                 documentStationService.saveBatch(listDocumentStation);
+            }
 
         }
 
@@ -867,10 +878,14 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
         //更新电站施工状态
         LambdaUpdateWrapper<PeasantHousehold> up = new LambdaUpdateWrapper<>();
 
-        List<DocumentStation> idsk = model.getPeasantHouseholdId();
         List<Long> idsH = new ArrayList<>();
 
-        for (DocumentStation documentStation : idsk) {
+        LambdaQueryWrapper<DocumentStation> stations = new LambdaQueryWrapper<>();
+        stations.eq(DocumentStation::getPreparationMoneyId,model.getSequenceNbr());
+        List<DocumentStation> documentStations = documentStationMapper.selectList(stations);
+
+
+        for (DocumentStation documentStation : documentStations) {
             idsH.add(documentStation.getStationId());
         }
         if (kv.getOrDefault("approvalStatus", "").equals("0")) {