封仓确认单bug修改

src/main/java/com/chinaitop/depot/storage/mapper/ClearanceConfirmationMapper.java

@@ -28,5 +28,5 @@ public interface ClearanceConfirmationMapper {
 
     Map<String, BigDecimal> getexcessLossQuantity(Integer warehouseId);
 
-    Map<String, String> getStoreHouse(Integer warehouseId);
+    Map<String, Object> getStoreHouse(Integer warehouseId);
 }

src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardMapper.xml

@@ -476,6 +476,7 @@
       cc.createdate,
       cc.updatedate,
       cc.fill_org_id,
+      o.org_name orgName,
       cc.keep_org_id,
       cc.storage_org_id,
       cc.warehouse_sealing_record_id,
@@ -507,6 +508,7 @@
               LEFT JOIN depot_qh.basic_enum tffs on xz.enumId = Bs.draftType
               LEFT JOIN depot_qh.basic_enum ccfs on xz.enumId = cc.keeping_way
               LEFT JOIN depot_qh.basic_enum cflx on xz.enumId = cc.storehouse_type
+              LEFT JOIN depot_qh.org_info o ON cc.fill_org_id = o.org_id
     where  cc.id=#{id}
   </select>
 

src/main/java/com/chinaitop/depot/storage/service/impl/GrainSituationCardServiceImpl.java

@@ -168,11 +168,14 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
         List<BusinessQcQualityInspection> bqqs =new ArrayList<>();
         BusinessQcQualityInspection businessQcQualityInspection=new BusinessQcQualityInspection();
         Map<Integer, List<String>> date =new HashMap<>();
+        Map<String,String> MAP=new HashMap<>();
         if(grainSituationCardVO.getCheckRecordIds()!=null) {
             String[] ids = grainSituationCardVO.getCheckRecordIds().split(",");
             for (int i = 0; i < ids.length; i++) {
                 //查询导检验类型，建议时间。。
                 businessQcQualityInspection=  businessQcQualityInspectionMapper.findByqualityId(ids[i]);
+                MAP.put("zjbgdh",businessQcQualityInspection.getZjbgdh());
+                MAP.put("jylb",businessQcQualityInspection.getJylb());
                 //查询质检明细
                 List<Map<String,Object>> itm =businessQcQualityInspectionItemMapper.findByqualityId(ids[i]);
                 date =    cat(itm);
@@ -182,10 +185,14 @@ public class GrainSituationCardServiceImpl implements GrainSituationCardService
                 businessQcQualityInspectionList.add(businessQcQualityInspection);
             }
         }
+        List<Map<String, String>> dataList = new ArrayList<>();
+        dataList.add(MAP);
+
+
         String fileName = "D:\\Temp\\aaa.xlsx";
         List<GrainSituationCardVO> data=new ArrayList<>();
         data.add(grainSituationCardVO);
-        ExcelExporter.exportToExcel(data,grainSituationCardWarehouseRecordList,businessQcQualityInspectionList,date,fileName);
+        ExcelExporter.exportToExcel(data,grainSituationCardWarehouseRecordList,dataList,date,fileName);
 
 
         return null;

src/main/java/com/chinaitop/depot/storage/service/impl/WarehouseSealingRecordServiceImpl.java

@@ -14,6 +14,7 @@ import com.chinaitop.depot.storage.service.WarehouseSealingRecordService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -52,7 +53,7 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
     public WarehouseSealingRecord findByWarehouseSea(Integer id) {
         return WarehouseSealingRecordMapper.findByWarehouseSea(id);
     }
-
+    @Transactional
     @Override
     public Map<String, Object> saveOrUpdate(HttpServletRequest request, String warehouseSealingRecordJson, String userInfo) throws Exception {
         Map<String, Object> modelMap = new HashMap<String, Object>();
@@ -157,22 +158,32 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
         if(WarehouseSealingRecord.getStatus()==1){
             //查询出清确认单时间
             int sum =0;
-            Date cqsj;
-            BigDecimal cksl;
+            Date cqsj=new Date();
+            BigDecimal cksl=BigDecimal.valueOf(0.00);
             ClearanceConfirmation clearanceConfirmation = clearanceConfirmationMapper.selectCqqrd(WarehouseSealingRecord.getWarehouseId());
-            if(clearanceConfirmation.getUpdatedate()==null){
-                cqsj= new Date();
+            if(clearanceConfirmation!=null){
+                if(clearanceConfirmation.getUpdatedate()==null&&!"".equals(clearanceConfirmation.getUpdatedate())){
+                    cqsj= new Date();
+                }
+                cqsj =clearanceConfirmation.getUpdatedate();
             }
-             cqsj =clearanceConfirmation.getUpdatedate();
+
+
             //查询fcbgz
             Map map =new HashMap<>();
             map.put("warehouseId",WarehouseSealingRecord.getWarehouseId());
             map.put("cqsj",cqsj);
             map.put("fcsj",date);
             Map<String, Double> map1=clearanceConfirmationMapper.selectFcbgz(map);
-             cksl =BigDecimal.valueOf(map1.get("cksl"));
+            if(map1 != null && !map1.isEmpty()){
+                if(map1.get("cksl")!=null){
+                    cksl =BigDecimal.valueOf(map1.get("cksl"));
+                }
+
+            }
+
             Map<String,BigDecimal> mmap=clearanceConfirmationMapper.getexcessLossQuantity(WarehouseSealingRecord.getWarehouseId());
-            Map<String,String> stoMap =clearanceConfirmationMapper.getStoreHouse(WarehouseSealingRecord.getWarehouseId());
+            Map<String,Object> stoMap =clearanceConfirmationMapper.getStoreHouse(WarehouseSealingRecord.getWarehouseId());
             GrainSituationCard grainSituationCard =new GrainSituationCard();
             grainSituationCard.setCreatedate(date);
             grainSituationCard.setUpdatedate(date);
@@ -192,12 +203,41 @@ public class WarehouseSealingRecordServiceImpl implements WarehouseSealingRecord
             grainSituationCard.setOutQuantity(cksl);
             grainSituationCard.setFormWarehouseTime(WarehouseSealingRecord.getZhgxsj());
             grainSituationCard.setStorageOrgId(WarehouseSealingRecord.getOrgId());
-            grainSituationCard.setExcessLossQuantity(mmap.get("getexcessLossQuantity"));
+            BigDecimal getexcessLossQuantity =BigDecimal.valueOf(0.00);
+            if(mmap!=null&&!mmap.isEmpty()){
+                if(mmap.get("getexcessLossQuantity")!=null){
+                    getexcessLossQuantity=mmap.get("getexcessLossQuantity");
+                }
+
+            }
+            grainSituationCard.setExcessLossQuantity(getexcessLossQuantity);
             grainSituationCard.setGlfs(WarehouseSealingRecord.getGlfs());
-            grainSituationCard.setKeepingWay(Integer.parseInt(stoMap.get("keepingWay")));
-            grainSituationCard.setDesignCapacity(BigDecimal.valueOf(Double.parseDouble(stoMap.get("designCapacity"))));
-            grainSituationCard.setDrafttype(Integer.parseInt(stoMap.get("draftType")));
-            grainSituationCard.setTemperatureMeasureType(Integer.parseInt(stoMap.get("temperatureMeasureType")));
+
+            BigDecimal designCapacity =BigDecimal.valueOf(0.00);
+            Integer keepingWay =null;
+            Integer draftType =null;
+            Integer temperatureMeasureType=null;
+
+                    if(stoMap != null && !stoMap.isEmpty()){
+                        if(stoMap.get("designCapacity")!=null){
+                            System.out.println("============================="+stoMap.get("designCapacity").toString());
+                            designCapacity =(BigDecimal)(stoMap.get("designCapacity"));
+                        }
+                        if(stoMap.get("keepingWay")!=null){
+                            keepingWay=(Integer)(stoMap.get("keepingWay"));
+                        }
+                        if(stoMap.get("draftType")!=null){
+                            draftType =(Integer)(stoMap.get("draftType"));
+                        }
+                        if(stoMap.get("temperatureMeasureType")!=null){
+                            temperatureMeasureType =(Integer)(stoMap.get("temperatureMeasureType"));
+                        }
+                    }
+
+            grainSituationCard.setKeepingWay(keepingWay);
+            grainSituationCard.setDesignCapacity(designCapacity);
+            grainSituationCard.setDrafttype(draftType);
+            grainSituationCard.setTemperatureMeasureType(temperatureMeasureType);
             grainSituationCardMapper.insert(grainSituationCard);
         }
         modelMap.put("status", "success");

src/main/java/com/chinaitop/depot/storage/utils/ExcelExporter.java

@@ -19,15 +19,13 @@ import java.util.*;
 public class ExcelExporter {
 
 
-        public static void exportToExcel(List<GrainSituationCardVO> data, List<GrainSituationCardWarehouseRecord> records, List<BusinessQcQualityInspection> bq, Map<Integer, List<String>> jsonData, String fileName) throws IOException{
+        public static void exportToExcel(List<GrainSituationCardVO> data, List<GrainSituationCardWarehouseRecord> records, List<Map<String, String>> dataList, Map<Integer, List<String>> inspectionItems, String fileName) throws IOException{
             XSSFWorkbook workbook = new XSSFWorkbook();
             XSSFSheet sheet = workbook.createSheet("原粮专卡");
 
             // 设置列标题和样式
             int rowIndex;
-            rowIndex= 1;
-            // 设置主标题并居中
-            Row titleRow = sheet.createRow(rowIndex++);
+            rowIndex= 0;
 
             Row headerRow = sheet.createRow(0);
             CellStyle headerCellStyle = workbook.createCellStyle();
@@ -100,20 +98,27 @@ public class ExcelExporter {
                         cell.setCellValue(card.getKeepingWayName() != null ? card.getKeepingWayName() : "无");
                     } else if ("通风方式".equals(field)) {
                         cell.setCellValue(card.getDrafttypeName() != null ? card.getDrafttypeName() : "无");
+                    } else if ("存储地点".equals(field)) {
+                        cell.setCellValue(card.getOrgName() != null ? card.getOrgName() : "无");
+                    }else if ("存储方式".equals(field)) {
+                        cell.setCellValue(card.getKeepingWay() == null ? 0 : card.getKeepingWay());
+                    }else if ("修改时间".equals(field)) {
+                        cell.setCellValue(card.getUpdatedate() == null ? "" : sdf.format(card.getUpdatedate()));
                     }
                 }
             }
 
-            rowIndex++; // 新增一行用于标题
 
             // 处理 GrainSituationCardWarehouseRecord 数据之前的表头
             rowIndex++; // 新增一行作为记录变更的表头行
             columnIndex = 0; // 重置列索引
+            Row headerForRowRecords = sheet.createRow(rowIndex);
             for (String field : getFieldsss()) {
-                Cell cell = sheet.createRow(rowIndex).createCell(columnIndex++);
+                Cell cell = headerForRowRecords.createCell(columnIndex++);
                 cell.setCellValue(field);
                 cell.setCellStyle(headerCellStyle);
             }
+            // 填充 GrainSituationCardWarehouseRecord 数据
             for (GrainSituationCardWarehouseRecord record : records) {
                 if (record == null) {
                     continue;
@@ -121,9 +126,10 @@ public class ExcelExporter {
 
                 rowIndex++; // 新增一行用于记录数据
                 columnIndex = 0;
-                Row row = sheet.createRow(rowIndex++);
-                for (String field : getFieldsss()) { // 假定使用getFieldsss()作为仓库记录的字段列表
-                    Cell cell = row.createCell(columnIndex++);
+                Row rowForRecord = sheet.createRow(rowIndex);
+                for (String field : getFieldsss()) {
+                    Cell cell = rowForRecord.createCell(columnIndex++);
+
                     if ("变更时间".equals(field)) {
                         cell.setCellValue(record.getChangeTime() == null ? "" : sdf.format(record.getChangeTime()));
                     } else if ("新货位号".equals(field)) {
@@ -133,50 +139,89 @@ public class ExcelExporter {
                     } else if ("变更原因".equals(field)) {
                         cell.setCellValue(record.getChangeReason() != null ? record.getChangeReason() : "无");
                     }
-                    // 根据需要继续添加其它字段的处理逻辑
+                    // 根据GrainSituationCardWarehouseRecord类的实际属性添加更多处理逻辑
                 }
             }
 
+            rowIndex++; // 新增一行作为记录变更的表头行
+            columnIndex = 0; // 重置列索引
+            // 确定所有可能的检验项目
+            Set<String> allInspectionCategories = new HashSet<>();
+            for (List<String> values : inspectionItems.values()) {
+                for (String item : values) {
+                    String category = item.split(":")[0].trim(); // 假设项目名称在冒号前
+                    allInspectionCategories.add(category);
+                }
+            }
+            rowIndex++;
+            // 创建表头
+            Row headerRow1 = sheet.createRow(0);
+            headerRow1.createCell(0).setCellValue("质检报告单号");
+            headerRow1.createCell(1).setCellValue("检验类别");
+            int colIndex = 2; // 从第三列开始放置动态检验项目
+            for (String category : allInspectionCategories) {
+                headerRow1.createCell(colIndex++).setCellValue(category);
+            }
+            // 检查inspectionItems是否只有一个键，如果是，则获取该键
+            Integer singleKeyId = inspectionItems.keySet().iterator().next();
 
+             rowIndex ++; // 从第二行开始写入数据
+            for (Map<String, String> data2 : dataList) {
+                Row dataRow = sheet.createRow(rowIndex++);
+                dataRow.createCell(0).setCellValue(data2.getOrDefault("zjbgdh", ""));
+                dataRow.createCell(1).setCellValue(data2.getOrDefault("jylb", ""));
 
-            rowIndex++; // 新增一行作为质量检验的表头行
-            headerRow.createCell(0).setCellValue("质检报告单号");
-            headerRow.createCell(1).setCellValue("检验时间");
-            columnIndex = 0; // 重置列索引
-            for (String field : getFieldss()) {
-                Cell cell = sheet.createRow(rowIndex).createCell(columnIndex++);
-                cell.setCellValue(field);
-                cell.setCellStyle(headerCellStyle);
+
+                // 填充动态检验项目值，这里直接根据单个键获取其值列表
+                List<String> items = inspectionItems.get(singleKeyId);
+
+                // 填充动态检验项目值
+                for (int i = 0; i < items.size(); i++) {
+                    String[] keyValue = items.get(i).split(": ");
+                    dataRow.createCell(i + 2).setCellValue(keyValue.length > 1 ? keyValue[1] : "");
+                }
             }
-//            // 填充数据
-            int rowNum = 1;
-//            for (Map<String, Object> record : jsonData) {
-//                Row row = sheet.createRow(rowNum++);
-//                row.createCell(0).setCellValue((String) record.get("zjbgdh"));
-//                row.createCell(1).setCellValue((String) record.get("jysj"));
-//
-//                // 填充动态检验项目值
-//                Map<String, Object> maps = (Map<String, Object>) record.get("maps");
-//                if (maps != null) {
-//                    List<String> items = (List<String>) maps.get(record.get("id").toString());
-//                    if (items != null) {
-//                        int col = 2; // 从第2列开始填充动态数据
-//                        for (String item : allInspectionItems) {
-//                            String value = "";
-//                            for (String checkItem : items) {
-//                                if (checkItem.startsWith(item + ":")) {
-//                                    value = checkItem.split(": ")[1];
-//                                    break;
+
+
+//            rowIndex++; // 新增一行作为质量检验的表头行
+//            columnIndex = 0; // 重置列索引
+//            Row rowForRecord = sheet.createRow(rowIndex);
+//            for (String field : getFieldss()) {
+//                Cell cell = sheet.createRow(rowIndex).createCell(columnIndex++);
+//                cell.setCellValue(field);
+//                cell.setCellStyle(headerCellStyle);
+//            }
+////            // 填充数据
+//            Row row = sheet.createRow(rowIndex++);
+//            for (Map<String, String> data2 : dataList) {
+//                if (data2 == null) {
+//                    continue;
+//                }
+//                row.createCell(0).setCellValue(data2.getOrDefault("zjbgdh", ""));
+//                row.createCell(1).setCellValue(data2.getOrDefault("jylb", ""));
+//                for (Map<Integer, Object> jd : jsonData) {
+//                    // 填充动态检验项目值
+//                    Map<String, Object> maps = (Map<String, Object>) jd.get("maps");
+//                    if (maps != null) {
+//                        List<String> items = (List<String>) maps.get(id.get("id").toString());
+//                        if (items != null) {
+//                            int col = 2; // 从第2列开始填充动态数据
+//                            for (String item : allInspectionItems) {
+//                                String value = "";
+//                                for (String checkItem : items) {
+//                                    if (checkItem.startsWith(item + ":")) {
+//                                        value = checkItem.split(": ")[1];
+//                                        break;
+//                                    }
 //                                }
 //                            }
+//                            row.createCell(col++).setCellValue(value);
 //                        }
-//                        row.createCell(col++).setCellValue(value);
 //                    }
 //                }
 //            }
-//        }
 //
-
+//        }
 
 
 
@@ -194,7 +239,7 @@ public class ExcelExporter {
     }
 
     private static String[] getFieldsss() {
-        return new String[]{"变更时间","新货位号"," 原货位号","变更原因"};
+        return new String[]{"变更时间","新货位号","原货位号","变更原因"};
     }
     private static String[] getFieldss() {
         return new String[]{"检验类型","质检报告单号","容重","水分","杂质","不完善粒","色泽,气味","硬度指数",