问题处理

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/jd/JdBackQualityWaitController.java

@@ -1,6 +1,7 @@
 package com.fjhx.victoriatourist.controller.jd;
 
-import com.ruoyi.common.annotation.NonInterception;
+import com.fjhx.victoriatourist.entity.jd.bo.JdBackQualityWaitExcelBo;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
@@ -10,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 /**
@@ -46,10 +48,12 @@ public class JdBackQualityWaitController {
 
     /**
      * 京东退货待质检导入Excel
+     *
+     * @return
      */
     @PostMapping("/importExcel")
-    public void importExcel(@RequestParam("file") MultipartFile file) {
-        jdBackQualityWaitService.importExcel(file);
+    public List<JdBackQualityWaitExcelBo> importExcel(@RequestParam("file") MultipartFile file) {
+        return jdBackQualityWaitService.importExcel(file);
     }
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/po/AbnormalDetails.java

@@ -1,5 +1,6 @@
 package com.fjhx.victoriatourist.entity.abnormal.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.util.Date;
@@ -27,6 +28,7 @@ public class AbnormalDetails extends BasePo {
     /**
      * 处理说明
      */
+    @TableField("`explain`")
     private String explain;
 
     /**

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/jd/bo/JdBackQualityWaitExcelBo.java

@@ -10,11 +10,11 @@ import java.math.BigDecimal;
 @Setter
 public class JdBackQualityWaitExcelBo {
 
-    /**
-     * 京东待质检id
-     */
-    @ExcelProperty("京东待质检id")
-    private String id;
+//    /**
+//     * 京东待质检id
+//     */
+//    @ExcelProperty("京东待质检id")
+//    private String id;
 
     /**
      * 产品id
@@ -23,12 +23,6 @@ public class JdBackQualityWaitExcelBo {
     private String productId;
 
     /**
-     * 待质检数量
-     */
-    @ExcelProperty("待质检数量")
-    private BigDecimal quantity;
-
-    /**
      * 产品编号
      */
     @ExcelProperty("产品编号")
@@ -58,6 +52,12 @@ public class JdBackQualityWaitExcelBo {
     @ExcelProperty("产品单位")
     private String productUnit;
 
+    /**
+     * 待质检数量
+     */
+    @ExcelProperty("待质检数量")
+    private BigDecimal quantity;
+
     @ExcelProperty("质检合格数量")
     private BigDecimal qualifiedQuantity;
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/stock/vo/StockTransferDetailsVo.java

@@ -34,7 +34,9 @@ public class StockTransferDetailsVo extends StockTransferDetails {
      */
     private String productUnit;
 
-    /**出入库编号*/
+    /**
+     * 出入库编号
+     */
     private String code;
 
     /**
@@ -57,8 +59,15 @@ public class StockTransferDetailsVo extends StockTransferDetails {
      */
     private Long outWarehouseId;
 
-    /**调仓数量*/
+    /**
+     * 调仓数量
+     */
     private BigDecimal quantity;
 
+    /**
+     * 操作人名称
+     */
+    private String operatorName;
+
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalDetailsServiceImpl.java

@@ -55,7 +55,7 @@ public class AbnormalDetailsServiceImpl extends ServiceImpl<AbnormalDetailsMappe
     public void add(AbnormalDetailsDto abnormalDetailsDto) {
         Long abnormalInfoId = abnormalDetailsDto.getAbnormalInfoId();
         if (ObjectUtil.isEmpty(abnormalInfoId)) {
-            throw new ServiceException("异常说明不能为空");
+            throw new ServiceException("异常记录id不能为空");
         }
         Assert.notEmpty(abnormalDetailsDto.getExplain(), "异常说明不能为空");
         Integer status = abnormalDetailsDto.getStatus();

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

@@ -1,13 +1,16 @@
 package com.fjhx.victoriatourist.service.jd;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.jd.bo.JdBackQualityWaitExcelBo;
 import com.fjhx.victoriatourist.entity.jd.dto.JdBackQualityWaitSelectDto;
 import com.fjhx.victoriatourist.entity.jd.po.JdBackQualityWait;
+import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityDetailsVo;
 import com.fjhx.victoriatourist.entity.jd.vo.JdBackQualityWaitVo;
 import com.ruoyi.common.core.service.BaseService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 
 /**
@@ -32,6 +35,8 @@ public interface JdBackQualityWaitService extends BaseService<JdBackQualityWait>
 
     /**
      * 导入excel
+     *
+     * @return
      */
-    void importExcel(MultipartFile file);
+    List<JdBackQualityWaitExcelBo> importExcel(MultipartFile file);
 }

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

@@ -17,7 +17,6 @@ import com.fjhx.victoriatourist.service.jd.JdBackQualityWaitService;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -73,10 +72,11 @@ public class JdBackQualityWaitServiceImpl extends ServiceImpl<JdBackQualityWaitM
     }
 
     @Override
-    public void importExcel(MultipartFile file){
+    public List<JdBackQualityWaitExcelBo> importExcel(MultipartFile file){
         List<JdBackQualityWaitExcelBo> read = ExcelUtil.read(file, JdBackQualityWaitExcelBo.class);
         List<JdBackQualityDetailsDto> jdBackQualityDetailsDtos = BeanUtil.copyToList(read, JdBackQualityDetailsDto.class);
         jdBackQualityDetailsService.add(jdBackQualityDetailsDtos);
+        return read;
     }
 
 }

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/stock/impl/StockTransferDetailsServiceImpl.java

@@ -13,6 +13,7 @@ import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
 import com.fjhx.wms.entity.stock.vo.StockVo;
 import com.fjhx.wms.service.warehouse.WarehouseService;
 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;
 
@@ -51,6 +52,8 @@ public class StockTransferDetailsServiceImpl extends ServiceImpl<StockTransferDe
         warehouseService.attributeAssign(page.getRecords(), StockTransferDetailsVo::getOutWarehouseId, (item, warehouse) -> {
             item.setOutWarehouseName(warehouse.getName());
         });
+        //赋值操作人名称
+        UserUtil.assignmentNickName(page.getRecords(),StockTransferDetailsVo::getUpdateUser,StockTransferDetailsVo::setOperatorName);
         return page;
     }
 

hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/stock/impl/StockTransferServiceImpl.java

@@ -35,11 +35,13 @@ 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;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -144,7 +146,6 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         List<Stock> stockList = new ArrayList<>();
         List<StockTransferDetails> stockTransferDetailsList = stockTransferDto.getStockTransferDetailsList();
         if(ObjectUtil.isNotEmpty(stockTransferDetailsList)) {
-            stockTransferDetailsService.updateBatchById(stockTransferDetailsList);
             //获取数据库中的数据
             List<Long> ids = stockTransferDetailsList.stream().map(StockTransferDetails::getId).collect(Collectors.toList());
             List<StockTransferDetails> oldstockTransferDetailsList = stockTransferDetailsService.listByIds(ids);
@@ -159,7 +160,10 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
                 //调仓接收数量与发出数量不一致
                 StockTransferDetails oldstockTransferDetails = oldstockTransferDetailsMap.get(stockTransferDetails.getId());
-                if (stockTransferDetails.getInQuantity() != oldstockTransferDetails.getOutQuantity()) {
+                //计算已入库数量
+                BigDecimal inCount = oldstockTransferDetails.getInQuantity().add(stockTransferDetails.getInQuantity());
+                stockTransferDetails.setInQuantity(inCount);
+                if (inCount != oldstockTransferDetails.getOutQuantity()) {
                     abnormalFlag =1;
                     stockTransfer.setInStatus(1);//设置为部分接收
                 }
@@ -173,6 +177,9 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
                 abnormalInfo.setTitle("调仓接收数量与发出数量不一致");
                 abnormalInfoService.save(abnormalInfo);
             }
+
+            //修改质检信息
+            stockTransferDetailsService.updateBatchById(stockTransferDetailsList);
         }
         updateById(stockTransfer);
         //创建入库记录
@@ -217,11 +224,12 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
 
         stockTransferDto.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockTransferDto.setType(1);
-        stockTransferDto.setInStatus(0);
+        stockTransferDto.setInStatus(2);//已接收
         this.save(stockTransferDto);
         List<StockTransferDetails> stockTransferDetailsList = stockTransferDto.getStockTransferDetailsList();
         for (StockTransferDetails stockTransferDetails : stockTransferDetailsList) {
             stockTransferDetails.setStockTransferId(stockTransferDto.getId());
+            stockTransferDetails.setInQuantity(stockTransferDetails.getOutQuantity());
         }
         stockTransferDetailsService.saveBatch(stockTransferDetailsList);