问题处理

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/jd/impl/JdOrderServiceImpl.java

@@ -35,6 +35,7 @@ import com.fjhx.wms.entity.stock.po.*;
 import com.fjhx.wms.service.stock.*;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -353,6 +354,8 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder> impl
         }
         //修改调仓状态
         stockTransfer.setInStatus(2);//修改为已接收
+        stockTransfer.setInUserId(SecurityUtils.getUserId());//赋值接收人
+        stockTransfer.setInTime(new Date());//赋值接收时间
         List<StockTransferDetails> stockTransferDetails = stockTransferDetailsService.list(q -> q.eq(StockTransferDetails::getStockTransferId, stockTransfer.getId()));
         for (StockTransferDetails stockTransferDetail : stockTransferDetails) {
             if(stockTransferDetail.getOutQuantity().compareTo(stockTransferDetail.getInQuantity())!=0){

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/quality/impl/QualityInfoServiceImpl.java

@@ -14,7 +14,6 @@ import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoDto;
 import com.fjhx.victoriatourist.entity.quality.dto.QualityInfoSelectDto;
 import com.fjhx.victoriatourist.entity.quality.po.QualityDetails;
 import com.fjhx.victoriatourist.entity.quality.po.QualityInfo;
-import com.fjhx.victoriatourist.entity.quality.vo.QualityDetailsVo;
 import com.fjhx.victoriatourist.entity.quality.vo.QualityInfoVo;
 import com.fjhx.victoriatourist.mapper.quality.QualityInfoMapper;
 import com.fjhx.victoriatourist.service.deliver.DeliverGoodsService;
@@ -26,7 +25,6 @@ import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.Stock;
 import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
-import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.service.arrival.ArrivalStockRecordsDetailsService;
 import com.fjhx.wms.service.arrival.ArrivalStockRecordsService;
 import com.fjhx.wms.service.stock.StockJournalDetailsService;
@@ -38,7 +36,6 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -96,7 +93,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
     public Page<QualityInfoVo> getPage1(QualityInfoSelectDto dto) {
         IWrapper<QualityInfo> wrapper = getWrapper();
         wrapper.orderByDesc("asr", QualityInfo::getId);
-        wrapper.eq("asr",QualityInfoVo::getQualityStatus,dto.getQualityStatus());
+        wrapper.eq("asr", QualityInfoVo::getQualityStatus, dto.getQualityStatus());
         Page<QualityInfoVo> page = this.baseMapper.getPage1(dto.getPage(), wrapper);
         List<QualityInfoVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {
@@ -137,7 +134,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         qualityInfoDto.setWarehouseId(arrivalStockRecords.getWarehouseId());
         //查询入库明细
         List<ArrivalStockRecordsDetails> arrivalStockRecordsDetailsList = arrivalStockRecordsDetailsService.list(q -> q.eq(ArrivalStockRecordsDetails::getArrivalStockRecordsId, qualityInfoDto.getArrivalStockRecordsId()));
-        Map<Long, ArrivalStockRecordsDetails> arrivalStockRecordsDetailsMap = arrivalStockRecordsDetailsList.stream().collect(Collectors.toMap(ArrivalStockRecordsDetails::getId,Function.identity()));
+        Map<Long, ArrivalStockRecordsDetails> arrivalStockRecordsDetailsMap = arrivalStockRecordsDetailsList.stream().collect(Collectors.toMap(ArrivalStockRecordsDetails::getId, Function.identity()));
         //创建质检记录
         qualityInfoDto.setBussinessId(qualityInfoDto.getArrivalStockRecordsId());
         //创建质检明细
@@ -145,7 +142,7 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
         for (QualityDetails qualityDetails : qualityDetailsList) {
             qualityDetails.setQualityInfoId(qualityInfoDto.getId());
             ArrivalStockRecordsDetails arrivalStockRecordsDetails = arrivalStockRecordsDetailsMap.get(qualityDetails.getArrivalStockRecordsDetailsId());
-            if(ObjectUtil.isEmpty(arrivalStockRecordsDetails)){
+            if (ObjectUtil.isEmpty(arrivalStockRecordsDetails)) {
                 throw new ServiceException("查询不到到货明细信息");
             }
             BigDecimal quantity = arrivalStockRecordsDetails.getQuantity();
@@ -153,8 +150,10 @@ public class QualityInfoServiceImpl extends ServiceImpl<QualityInfoMapper, Quali
 
             BigDecimal count = qualityDetails.getQualifiedQuantity().add(qualityDetails.getDisqualificationQuantity());
             //统计已经质检的数量
-            arrivalStockRecordsDetails.setQualityQuantity(arrivalStockRecordsDetails.getQuantity().add(count));
-            if(quantity.compareTo(count)!=0){
+            BigDecimal qualityQuantity = arrivalStockRecordsDetails.getQualityQuantity();
+            qualityQuantity = ObjectUtil.isEmpty(qualityQuantity) ? BigDecimal.ZERO : qualityQuantity;
+            arrivalStockRecordsDetails.setQualityQuantity(qualityQuantity.add(count));
+            if (quantity.compareTo(count) != 0) {
                 qualityInfoDto.setStatus(1);//修改为部分质检
                 arrivalStockRecords.setQualityStatus(1);//修改为部分质检
             }