From e131f6e16de1df9fdcb7ede55cb9f4dc93e48ae8 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 21 十月 2024 08:10:34 +0800
Subject: [PATCH] 修改发货报表以及新增单片周长字段
---
north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
index 818301d..963e289 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/BasicDateService.java
@@ -1,7 +1,9 @@
package com.example.erp.service.sd;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.sd.BasicData;
+import com.example.erp.entity.sd.BasicOtherMoney;
import com.example.erp.entity.sd.Customer;
import com.example.erp.mapper.sd.BasicDateMapper;
import com.example.erp.mapper.sd.BasicOtherMoneyMapper;
@@ -42,7 +44,10 @@
orderBasicDataMap.get("customer").add(customer);
}
- orderBasicDataMap.put("orderOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
+ orderBasicDataMap.put("orderOtherMoney",
+ Collections.singletonList(
+ basicOtherMoneyMapper.selectList(new QueryWrapper<BasicOtherMoney>().eq("state",1))
+ ));
//杩斿洖Map瀵硅薄
@@ -90,6 +95,7 @@
//灏嗘暟鎹斁鍏ist涓�
BasicDataMap.get(item.getBasicCategory()).add(item);
}
+ BasicDataMap.put("deliveryOtherMoney", Collections.singletonList(basicOtherMoneyMapper.selectList(null)));
return BasicDataMap;
}
@@ -135,6 +141,7 @@
basicData.setBasicType(basicTypeList.get(0));
basicData.setBasicCategory(basicTypeList.get(1));
basicData.setBasicName(map.get("input").toString());
+ basicData.setNickname(map.get("nickname").toString());
basicDateMapper.insert(basicData);
}
return true;
--
Gitblit v1.8.0