Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-12-01 5efd01db698683e95a63053da43aaa08fa35a185

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/service/impl/WeighServiceImpl.java

@@ -3,18 +3,25 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
import com.thhy.materials.modules.biz.concret.entity.SysSteel;
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
import com.thhy.materials.modules.biz.concret.entity.dto.TMinxingPlant;
import com.thhy.materials.modules.biz.concret.entity.dto.WeighDto;
import com.thhy.materials.modules.biz.weigh.dto.QueryWeighDto;
import com.thhy.materials.modules.biz.weigh.entity.TSuMaterialWarehouseRecord;
import com.thhy.materials.modules.biz.weigh.entity.TWeighbridge;
import com.thhy.materials.modules.biz.weigh.entity.WeighVo;
import com.thhy.materials.modules.biz.weigh.entity.dto.AssistGoodDto;
import com.thhy.materials.modules.biz.weigh.entity.dto.MaterialStockRecordDto;
import com.thhy.materials.modules.biz.weigh.entity.dto.MouldDto;
import com.thhy.materials.modules.biz.weigh.entity.dto.SteelDto;
import com.thhy.materials.modules.biz.weigh.mapper.WeighMapper;
import com.thhy.materials.modules.biz.weigh.service.WeighService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -95,4 +102,58 @@
      PageInfo<TWeighbridge> tWeighbridgePageInfo = new PageInfo<>(weighbridges);
      return BasicResult.success(tWeighbridgePageInfo);
   }

   @Override
   public BasicResult headThingJsInventory() {

      //原料库存
      List<MaterialStockRecordDto> materialStockDtos =weighMapper.materialStockInventory();
      //钢筋
      List<SteelDto> steelDtos = weighMapper.steelInventory();
      //辅材
      List<AssistGoodDto> assistGoodDtos = weighMapper.assistGoodInventory();

      //模具
      List<MouldDto> mouldDtos = weighMapper.mouldInventory();
      HashMap<String, Object> map = new HashMap<>();
      map.put("materialStockDtos",materialStockDtos);
      map.put("steelDtos",steelDtos);
      map.put("assistGoodDtos",assistGoodDtos);
      map.put("mouldDtos",mouldDtos);
      return BasicResult.success(map);
   }

   @Override
   public List<SysSteel> steelType() {
      return weighMapper.steelType();
   }

   @Override
   public BasicResult materialWarehouseRecordList(Map<String, Object> values) {
      Integer pageSize = Integer.valueOf(values.get("pageSize").toString());
      Integer pageNum = Integer.valueOf(values.get("pageNum").toString());
      PageHelper.startPage(pageNum,pageSize);
      List<TSuMaterialWarehouseRecord> records = weighMapper.materialWarehouseRecordList(values);
      PageInfo<TSuMaterialWarehouseRecord> recordPageInfo = new PageInfo<>(records);
      return BasicResult.success(recordPageInfo);
   }

   @Override
   public BasicResult materialWarehouseRecordInsert(Map<String, Object> values) {
      values.put("id","");
      weighMapper.materialWarehouseRecordInsert(values);
      return BasicResult.success();
   }

   @Override
   public BasicResult materialWarehouseRecordUpdate(Map<String, Object> values) {
      weighMapper.materialWarehouseRecordUpdate(values);
      return BasicResult.success();
   }

   @Override
   public BasicResult materialWarehouseRecordDel(String id) {
      weighMapper.materialWarehouseRecordDel(id);
      return BasicResult.success();
   }
}