From 075a7f53f6673c9610da400c7854758cd6da0630 Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Tue, 6 Jan 2026 15:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E5=85=B7=E9=A2=86=E7=94=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/lease/ReceiveDetailsMapper.xml    |  5 +-
 .../controller/ReceiveDetailsController.java  | 58 +++++++++----------
 2 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/resources/mybatis/lease/ReceiveDetailsMapper.xml b/resources/mybatis/lease/ReceiveDetailsMapper.xml
index f5d25a6..9e2a7f9 100644
--- a/resources/mybatis/lease/ReceiveDetailsMapper.xml
+++ b/resources/mybatis/lease/ReceiveDetailsMapper.xml
@@ -312,13 +312,10 @@
 			   mt2.`NAME`
 		FROM mm_type mt
 				 LEFT JOIN mm_type mt2 on mt2.ID = mt.PARENT_ID
-				 LEFT JOIN mm_type mt3 on mt3.ID = mt2.PARENT_ID
-				 LEFT JOIN mm_type mt4 on mt4.ID = mt3.PARENT_ID
 		WHERE mt.`name` = #{maModel}
 		  and mt.`level` = '4'
 		  and mt2.`NAME` = #{maType}
-		  and mt3.`NAME` = #{secondName}
-		  and mt4.`NAME` = #{firstName}
+		limit 1
 	</select>
 	<select id="getUserByUserName" resultType="com.bonus.lease.beans.ReceiveDetailsBean">
 		SELECT id     as customerSrepId,
diff --git a/src/com/bonus/lease/controller/ReceiveDetailsController.java b/src/com/bonus/lease/controller/ReceiveDetailsController.java
index 9830057..3626f55 100644
--- a/src/com/bonus/lease/controller/ReceiveDetailsController.java
+++ b/src/com/bonus/lease/controller/ReceiveDetailsController.java
@@ -412,16 +412,16 @@ public class ReceiveDetailsController extends BaseController<ReceiveDetailsBean>
 	private Map<String, Object> outMachineTypeBeanToMap(int i, MachineTypeBean bean) {
 		Map<String, Object> maps = new LinkedHashMap<String, Object>();
 		maps.put("id", i + 1);
-		maps.put("firstName", bean.getFirstName());
-		maps.put("secondName", bean.getSecondName());
+//		maps.put("firstName", bean.getFirstName());
+//		maps.put("secondName", bean.getSecondName());
 		maps.put("parentName", bean.getParentName());
 		maps.put("name", bean.getName());
-		maps.put("unit", bean.getUnit());
-		maps.put("nums", bean.getNums());
-		maps.put("buyPrice", bean.getBuyPrice());
-		maps.put("leasePrice", bean.getLeasePrice());
-		maps.put("payPrice", bean.getPayPrice());
-		maps.put("isTest", bean.getIsTest());
+//		maps.put("unit", bean.getUnit());
+//		maps.put("nums", bean.getNums());
+//		maps.put("buyPrice", bean.getBuyPrice());
+//		maps.put("leasePrice", bean.getLeasePrice());
+//		maps.put("payPrice", bean.getPayPrice());
+//		maps.put("isTest", bean.getIsTest());
 		maps.put("customerSrep", "");
 		maps.put("machinesNum", "");
 		return maps;
@@ -430,16 +430,16 @@ public class ReceiveDetailsController extends BaseController<ReceiveDetailsBean>
 	private List<String> machineTypeHeader() {
 		ArrayList<String> list = new ArrayList<String>();
 		list.add("序号");
-		list.add("施工机具类型");
-		list.add("设备分类");
+//		list.add("施工机具类型");
+//		list.add("设备分类");
 		list.add("机具类型");
 		list.add("规格型号");
-		list.add("计量单位");
-		list.add("库存量");
-		list.add("原值(元)");
-		list.add("租赁价格(元)");
-		list.add("丢失赔偿价格(元)");
-		list.add("是否只计数");
+//		list.add("计量单位");
+//		list.add("库存量");
+//		list.add("原值(元)");
+//		list.add("租赁价格(元)");
+//		list.add("丢失赔偿价格(元)");
+//		list.add("是否只计数");
 		list.add("客服代表");
 		list.add("领料数量");
 		return list;
@@ -522,32 +522,32 @@ public class ReceiveDetailsController extends BaseController<ReceiveDetailsBean>
 	            StringBuilder rowErrorMsg = new StringBuilder();
 
 	            // 低版本POI兼容：手动判断单元格是否为null（无MissingCellPolicy）
-				Cell firstNameCell = row.getCell(1);
-				String firstName = getCellStringValue(firstNameCell);
-				bean.setFirstName(firstName);
+//				Cell firstNameCell = row.getCell(1);
+//				String firstName = getCellStringValue(firstNameCell);
+//				bean.setFirstName(firstName);
+//
+//				Cell secondNameCell = row.getCell(2);
+//				String secondName = getCellStringValue(secondNameCell);
+//				bean.setSecondName(secondName);
 
-				Cell secondNameCell = row.getCell(2);
-				String secondName = getCellStringValue(secondNameCell);
-				bean.setSecondName(secondName);
-
-	            Cell maTypeCell = row.getCell(3);
+	            Cell maTypeCell = row.getCell(1);
 	            String maType = getCellStringValue(maTypeCell);
 	            bean.setMaType(maType);
 
-	            Cell maModelCell = row.getCell(4);
+	            Cell maModelCell = row.getCell(2);
 	            String maModel = getCellStringValue(maModelCell);
 	            bean.setMaModel(maModel);
 
-	            Cell customerSrepCell = row.getCell(11);
+	            Cell customerSrepCell = row.getCell(3);
 	            String customerSrep = getCellStringValue(customerSrepCell);
 	            bean.setCustomerSrep(customerSrep);
 
-	            Cell machinesNumCell = row.getCell(12);
+	            Cell machinesNumCell = row.getCell(4);
 	            String machinesNum = getCellStringValue(machinesNumCell);
 	            bean.setMachinesNum(machinesNum);
 
 				//如果施工机具类型、设备分类、物资名称、规格型号、客户代表、领料数量中有一个为空，则跳过该行数据
-				if (StringHelper.isEmpty(firstName) || StringHelper.isEmpty(secondName) || StringHelper.isEmpty(maType) || StringHelper.isEmpty(maModel) || StringHelper.isEmpty(customerSrep) || StringHelper.isEmpty(machinesNum)) {
+				if (StringHelper.isEmpty(maType) || StringHelper.isEmpty(maModel) || StringHelper.isEmpty(customerSrep) || StringHelper.isEmpty(machinesNum)) {
 					continue;
 				}
 
@@ -574,7 +574,7 @@ public class ReceiveDetailsController extends BaseController<ReceiveDetailsBean>
 	                }
 	            }
 
-	            // 8. 施工机具类型+设备分类+物资名称+规格型号存在性校验
+	            // 8. 物资名称+规格型号存在性校验
 	            if (rowErrorMsg.length() == 0) {
 	                ReceiveDetailsBean receiveDetailsBean = service.getMaTypeByNameAndModel(bean);
 	                if (receiveDetailsBean == null) {