|
@@ -10,6 +10,7 @@ import com.ruoyi.warehouseBusiness.mapper.TWarehouseBillsMapper;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
|
|
@@ -116,18 +117,104 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public List<Map<String, Object>> selectGoodsList() {
|
|
|
- return tWhgenlegMapper.selectGoodsList();
|
|
|
+ public Map<String, Object> selectGoodsList(Long fId) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ List<Map<String, Object>> goodslist=tWhgenlegMapper.selectGoodsList();
|
|
|
+ map.put("goodslist", goodslist);
|
|
|
+ if(goodslist!=null){
|
|
|
+ Long fid = null;
|
|
|
+ for(Map<String, Object> m : goodslist){
|
|
|
+ for (String k : m.keySet()){
|
|
|
+ if(k.equals("fGoodsid")){
|
|
|
+ fid= (Long) m.get(k);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<Map<String, Object>> goodslistWhouse;
|
|
|
+ if(null!= fId ){
|
|
|
+ goodslistWhouse=tWhgenlegMapper.selectGoodsListWhouse(fId);
|
|
|
+ }else{
|
|
|
+ goodslistWhouse=tWhgenlegMapper.selectGoodsListWhouse(fid);
|
|
|
+ }
|
|
|
+ for (Map<String, Object> m : goodslistWhouse){
|
|
|
+ String fTotalgross = null;
|
|
|
+ String fGrossweightblc = null;
|
|
|
+ for (String k : m.keySet()){
|
|
|
+ // 获取毛重库容
|
|
|
+ if(k.equals("fTotalgross")){
|
|
|
+ fTotalgross= m.get(k).toString();
|
|
|
+ }
|
|
|
+ if(k.equals("fGrossweightD")){
|
|
|
+ fGrossweightblc= m.get(k).toString();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ m.put("percentage",calculation(fGrossweightblc,fTotalgross));
|
|
|
+ }
|
|
|
+ map.put("goodslistWhouse", goodslistWhouse);
|
|
|
+ }
|
|
|
+ return map;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public List<Map<String, Object>> selectWareHouseList() {
|
|
|
- return tWhgenlegMapper.selectWareHouseList();
|
|
|
+ List<Map<String, Object>> list = tWhgenlegMapper.selectWareHouseList();
|
|
|
+ for (Map<String, Object> m : list){
|
|
|
+ String fTotalgross = null;
|
|
|
+ String fGrossweightblc = null;
|
|
|
+ for (String k : m.keySet()){
|
|
|
+ // 获取毛重库容
|
|
|
+ if(k.equals("fTotalgross")){
|
|
|
+ fTotalgross= m.get(k).toString();
|
|
|
+ }
|
|
|
+ if(k.equals("fGrossweightD")){
|
|
|
+ fGrossweightblc= m.get(k).toString();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ m.put("percentage",calculation(fGrossweightblc,fTotalgross));
|
|
|
+ }
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<Map<String, Object>> selectCorpsList() {
|
|
|
- return tWhgenlegMapper.selectCorpsList();
|
|
|
+ public Map<String, Object> selectCorpsList(Long fId) {
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
+ // 查询所有 客户
|
|
|
+ List<Map<String, Object>> corpsList=tWhgenlegMapper.selectCorpsList();
|
|
|
+ map.put("corpsList", corpsList);
|
|
|
+ if(corpsList!=null){
|
|
|
+ Long fid = null;
|
|
|
+ for(Map<String, Object> m : corpsList){
|
|
|
+ for (String k : m.keySet()){
|
|
|
+ if(k.equals("fCorpid")){
|
|
|
+ fid= (Long) m.get(k);
|
|
|
+ }
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ List<Map<String, Object>> corpsListWhouse;
|
|
|
+ if(null!= fId ){
|
|
|
+ corpsListWhouse=tWhgenlegMapper.selectCorpsListWhouse(fId);
|
|
|
+ }else{
|
|
|
+ corpsListWhouse=tWhgenlegMapper.selectCorpsListWhouse(fid);
|
|
|
+ }
|
|
|
+ for (Map<String, Object> m : corpsListWhouse){
|
|
|
+ String fTotalgross = null;
|
|
|
+ String fGrossweightblc = null;
|
|
|
+ for (String k : m.keySet()){
|
|
|
+ // 获取毛重库容
|
|
|
+ if(k.equals("fTotalgross")){
|
|
|
+ fTotalgross= m.get(k).toString();
|
|
|
+ }
|
|
|
+ if(k.equals("fGrossweightD")){
|
|
|
+ fGrossweightblc= m.get(k).toString();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ m.put("percentage",calculation(fGrossweightblc,fTotalgross));
|
|
|
+ }
|
|
|
+ map.put("corpsListWhouse", corpsListWhouse);
|
|
|
+ }
|
|
|
+ return map;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -160,19 +247,19 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
|
|
|
|
|
|
/**
|
|
|
*
|
|
|
- * @param combineField 根据该字段进行合并
|
|
|
+ * @param fOriginalbilldate 根据该字段进行合并
|
|
|
* @param dataList 原始数据
|
|
|
* @return
|
|
|
*/
|
|
|
- public static List<Map<String, Object>> combineMap(String combineField, List<Map<String, Object>> dataList){
|
|
|
+ public static List<Map<String, Object>> combineMap(String fOriginalbilldate, List<Map<String, Object>> dataList){
|
|
|
//用于存放最后的结果
|
|
|
List<Map<String, Object>> countList = new ArrayList<Map<String,Object>>();
|
|
|
for (int i = 0; i < dataList.size(); i++) {
|
|
|
- String oldCombineField = String.valueOf(dataList.get(i).get(combineField));
|
|
|
+ String oldCombineField = String.valueOf(dataList.get(i).get(fOriginalbilldate));
|
|
|
|
|
|
int flag = 0;//0为新增数据,1为增加count
|
|
|
for (int j = 0; j < countList.size(); j++) {
|
|
|
- String newCombineField = String.valueOf(countList.get(j).get(combineField));
|
|
|
+ String newCombineField = String.valueOf(countList.get(j).get(fOriginalbilldate));
|
|
|
if (oldCombineField.equals(newCombineField)) {
|
|
|
//做累加的操作
|
|
|
Integer afterSaleProfit = Integer.parseInt(String.valueOf(dataList.get(i).get("fQtyblc"))) + Integer.parseInt(String.valueOf(countList.get(j).get("fQtyblc")));
|
|
@@ -216,4 +303,21 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 返回百分比
|
|
|
+ * @param fTotalgross
|
|
|
+ * @param fGrossweightblc
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public static String calculation(String fTotalgross, String fGrossweightblc){
|
|
|
+ BigDecimal num1 = new BigDecimal(fTotalgross);
|
|
|
+ BigDecimal num2 = new BigDecimal(fGrossweightblc);
|
|
|
+ BigDecimal result = num1.divide(num2,2,BigDecimal.ROUND_HALF_UP);
|
|
|
+ int i = new Double(result.doubleValue()*100).intValue();
|
|
|
+ String str = i + "%";
|
|
|
+ System.out.println(str);
|
|
|
+ return str;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|