[fix]

仓库管理 库存报损
修改库存报损导出controller接口；
修改库存报损新增和编辑service接口，补充字段；

ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseInventoryReportDamageController.java

@@ -6,16 +6,21 @@ import com.ruoyi.ck.utils.Result;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.ShiroUtils;
+import com.ruoyi.erp.domain.ErpMaterialVo;
 import com.ruoyi.system.domain.SysMakeorderBom;
 import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysMakeorderBomMapper;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.warehouse.domain.VO.WarehouseMaterialVO;
+import com.ruoyi.warehouse.domain.WarehouseInventoryReportDamageChild;
+import com.ruoyi.warehouse.mapper.WarehouseInventoryReportDamageChildMapper;
+import com.ruoyi.warehouse.service.IWarehouseInventoryReportDamageChildService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.enums.BusinessType;
@@ -49,6 +54,12 @@ public class WarehouseInventoryReportDamageController extends BaseController
     @Autowired
     private SysMakeorderBomMapper sysMakeorderBomMapper;
 
+    @Autowired
+    private IWarehouseInventoryReportDamageChildService damageChildService;
+
+    @Autowired
+    private WarehouseInventoryReportDamageChildMapper damageChildMapper;
+
     @RequiresPermissions("warehouse:inventoryReportDamage:view")
     @GetMapping()
     public String inventoryReportDamage()
@@ -76,11 +87,19 @@ public class WarehouseInventoryReportDamageController extends BaseController
     @Log(title = "仓库库存报损", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(WarehouseInventoryReportDamage warehouseInventoryReportDamage)
+    public AjaxResult export(WarehouseInventoryReportDamage warehouseInventoryReportDamage, String ids) {
-    {
+
-        List<WarehouseInventoryReportDamage> list = warehouseInventoryReportDamageService.selectWarehouseInventoryReportDamageList(warehouseInventoryReportDamage);
+        if (StringUtils.isEmpty(ids)){
-        ExcelUtil<WarehouseInventoryReportDamage> util = new ExcelUtil<WarehouseInventoryReportDamage>(WarehouseInventoryReportDamage.class);
+            WarehouseInventoryReportDamageChild damageChild = new WarehouseInventoryReportDamageChild();
+            List<WarehouseInventoryReportDamageChild> list = damageChildService.selectWarehouseInventoryReportDamageChildList(damageChild);
+            ExcelUtil<WarehouseInventoryReportDamageChild> util = new ExcelUtil<WarehouseInventoryReportDamageChild>(WarehouseInventoryReportDamageChild.class);
             return util.exportExcel(list, "仓库库存报损数据");
+        }else {
+            String[] damageCodes = ids.split(",");
+            List<WarehouseInventoryReportDamageChild> list = damageChildMapper.selectWarehouseInventoryReportDamageChildByCodes(damageCodes);
+            ExcelUtil<WarehouseInventoryReportDamageChild> util = new ExcelUtil<WarehouseInventoryReportDamageChild>(WarehouseInventoryReportDamageChild.class);
+            return util.exportExcel(list, ids);
+        }
     }
 
     /**
@@ -122,7 +141,7 @@ public class WarehouseInventoryReportDamageController extends BaseController
     @Log(title = "仓库库存报损", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(WarehouseInventoryReportDamage warehouseInventoryReportDamage)
+    public AjaxResult editSave(@RequestBody WarehouseInventoryReportDamage warehouseInventoryReportDamage)
     {
         return toAjax(warehouseInventoryReportDamageService.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamage));
     }

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseInventoryReportDamageServiceImpl.java

@@ -105,6 +105,9 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
                 sumTotal = sumTotal.add(warehouseInventoryReportDamageChild.getActualScrapQuantity());
                 warehouseInventoryReportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo());
                 warehouseInventoryReportDamageChild.setReportDamageCode(newCode);
+                if(warehouseInventoryReportDamage.getApplyTime()!=null){
+                    warehouseInventoryReportDamageChild.setScrapDate(warehouseInventoryReportDamage.getApplyTime());
+                }
                 warehouseInventoryReportDamageChild.setCreateTime(DateUtils.getNowDate());
                 warehouseInventoryReportDamageChild.setCreateBy(loginName);
                 warehouseInventoryReportDamageChild.setWarehouseCode(warehouseInventoryReportDamage.getWarehouseCode());
@@ -134,15 +137,20 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
         String loginName = ShiroUtils.getLoginName();
         warehouseInventoryReportDamage.setUpdateBy(loginName);
         warehouseInventoryReportDamage.setUpdateTime(DateUtils.getNowDate());
+        BigDecimal sumTotal = BigDecimal.ZERO;
         if(StringUtils.isNotEmpty(warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList())){
             //清除现在的子表信息
             warehouseInventoryReportDamageChildService.deleteWarehouseInventoryReportDamageChildByCode(warehouseInventoryReportDamage.getReportDamageCode());
             for(WarehouseInventoryReportDamageChild warehouseInventoryReportDamageChild:warehouseInventoryReportDamage.getWarehouseInventoryReportDamageChildList()){
                 //子表数据不为空，则插入子表数据
+                sumTotal = sumTotal.add(warehouseInventoryReportDamageChild.getActualScrapQuantity());
                 warehouseInventoryReportDamageChild.setMakeNo(warehouseInventoryReportDamage.getMakeNo());
                 warehouseInventoryReportDamageChild.setReportDamageCode(warehouseInventoryReportDamage.getReportDamageCode());
                 warehouseInventoryReportDamageChild.setCreateTime(DateUtils.getNowDate());
                 warehouseInventoryReportDamageChild.setCreateBy(loginName);
+                if(warehouseInventoryReportDamage.getApplyTime()!=null){
+                    warehouseInventoryReportDamageChild.setScrapDate(warehouseInventoryReportDamage.getApplyTime());
+                }
                 warehouseInventoryReportDamageChild.setWarehouseCode(warehouseInventoryReportDamage.getWarehouseCode());
                 warehouseInventoryReportDamageChild.setWarehouseName(warehouseInventoryReportDamage.getWarehouseName());
                 warehouseInventoryReportDamageChild.setWarehouseStoreAddress(warehouseInventoryReportDamage.getWarehouseStoreAddress());
@@ -155,6 +163,7 @@ public class WarehouseInventoryReportDamageServiceImpl implements IWarehouseInve
             //子表数据为空，则抛出异常
             throw new BusinessException("报损子表数据为空");
         }
+        warehouseInventoryReportDamage.setNumTotal(sumTotal);
         return warehouseInventoryReportDamageMapper.updateWarehouseInventoryReportDamage(warehouseInventoryReportDamage);
     }