|
@@ -3,17 +3,33 @@
|
|
*/
|
|
*/
|
|
package com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.service;
|
|
package com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.service;
|
|
|
|
|
|
|
|
+import com.jeeplus.common.json.AjaxJson;
|
|
|
|
+import com.jeeplus.common.utils.DateUtils;
|
|
|
|
+import com.jeeplus.common.utils.StringUtils;
|
|
|
|
+import com.jeeplus.common.utils.excel.ExportExcel;
|
|
|
|
+import com.jeeplus.common.utils.excel.fieldtype.AreaType;
|
|
|
|
+import com.jeeplus.core.persistence.DataEntity;
|
|
import com.jeeplus.core.persistence.Page;
|
|
import com.jeeplus.core.persistence.Page;
|
|
import com.jeeplus.core.service.CrudService;
|
|
import com.jeeplus.core.service.CrudService;
|
|
import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.entity.LiKuResourcePool;
|
|
import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.entity.LiKuResourcePool;
|
|
import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.mapper.LiKuResourcePoolMapper;
|
|
import com.jeeplus.modules.sg.balancedlibrary.liKuResourcePool.mapper.LiKuResourcePoolMapper;
|
|
|
|
+import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.constant.AreaCodeFlagEnum;
|
|
|
|
+import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.constant.AreaTypeFlagEnum;
|
|
|
|
+import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.constant.MaterialsUnitFlagEnum;
|
|
import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.entity.LikuDetail;
|
|
import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.entity.LikuDetail;
|
|
import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.entity.MaterialReportDetails;
|
|
import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.entity.MaterialReportDetails;
|
|
import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.mapper.MaterialReportDetailsMapper;
|
|
import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.mapper.MaterialReportDetailsMapper;
|
|
|
|
+import com.jeeplus.modules.sg.balancedlibrary.onPassageMaterials.entity.MaterialInformation;
|
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
|
+import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
+import java.util.stream.Stream;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 物资上报明细Service
|
|
* 物资上报明细Service
|
|
@@ -25,42 +41,47 @@ import java.util.List;
|
|
@Transactional(readOnly = true)
|
|
@Transactional(readOnly = true)
|
|
public class MaterialReportDetailsService extends CrudService<MaterialReportDetailsMapper, MaterialReportDetails> {
|
|
public class MaterialReportDetailsService extends CrudService<MaterialReportDetailsMapper, MaterialReportDetails> {
|
|
|
|
|
|
- @Override
|
|
|
|
- public MaterialReportDetails get(String id) {
|
|
|
|
- return super.get(id);
|
|
|
|
- }
|
|
|
|
|
|
+ @Autowired
|
|
|
|
+ private LiKuResourcePoolMapper liKuResourcePoolMapper;
|
|
|
|
+ @Autowired
|
|
|
|
+ private MaterialReportDetailsMapper materialReportDetailsMapper;
|
|
|
|
|
|
- @Override
|
|
|
|
- public List<MaterialReportDetails> findList(MaterialReportDetails entity) {
|
|
|
|
- return super.findList(entity);
|
|
|
|
- }
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public MaterialReportDetails get(String id) {
|
|
|
|
+ return super.get(id);
|
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
|
- public Page<MaterialReportDetails> findPage(Page<MaterialReportDetails> page, MaterialReportDetails entity) {
|
|
|
|
- return super.findPage(page, entity);
|
|
|
|
- }
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public List<MaterialReportDetails> findList(MaterialReportDetails entity) {
|
|
|
|
+ return super.findList(entity);
|
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
|
- @Transactional(readOnly = false)
|
|
|
|
- public void save(MaterialReportDetails entity) {
|
|
|
|
- super.save(entity);
|
|
|
|
- }
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public Page<MaterialReportDetails> findPage(Page<MaterialReportDetails> page, MaterialReportDetails entity) {
|
|
|
|
+ return super.findPage(page, entity);
|
|
|
|
+ }
|
|
|
|
|
|
- @Override
|
|
|
|
- @Transactional(readOnly = false)
|
|
|
|
- public void delete(MaterialReportDetails entity) {
|
|
|
|
- super.delete(entity);
|
|
|
|
- }
|
|
|
|
|
|
+ @Override
|
|
|
|
+ @Transactional(readOnly = false)
|
|
|
|
+ public void save(MaterialReportDetails entity) {
|
|
|
|
+ super.save(entity);
|
|
|
|
+ }
|
|
|
|
|
|
- @Transactional(readOnly = false)
|
|
|
|
- public void insertList(List<MaterialReportDetails> list) {
|
|
|
|
- mapper.insertList(list);
|
|
|
|
- }
|
|
|
|
|
|
+ @Override
|
|
|
|
+ @Transactional(readOnly = false)
|
|
|
|
+ public void delete(MaterialReportDetails entity) {
|
|
|
|
+ super.delete(entity);
|
|
|
|
+ }
|
|
|
|
|
|
- @Transactional(readOnly = false)
|
|
|
|
- public void delAll() {
|
|
|
|
- mapper.delAll();
|
|
|
|
- }
|
|
|
|
|
|
+ @Transactional(readOnly = false)
|
|
|
|
+ public void insertList(List<MaterialReportDetails> list) {
|
|
|
|
+ mapper.insertList(list);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Transactional(readOnly = false)
|
|
|
|
+ public void delAll() {
|
|
|
|
+ mapper.delAll();
|
|
|
|
+ }
|
|
|
|
|
|
public List<LikuDetail> getLikuDetails(MaterialReportDetails report){
|
|
public List<LikuDetail> getLikuDetails(MaterialReportDetails report){
|
|
return mapper.getLikuDetails(report);
|
|
return mapper.getLikuDetails(report);
|