1.新增文件导出,上传工具类

2.新增入库模板下载功能接口
3.新增入库模板导入功能接口
4.新增批量入库功能接口

sto/src/main/java/com/shinsoft/sto/controller/record/InRecordController.java

@@ -1,22 +1,29 @@
 package com.shinsoft.sto.controller.record;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.shinsoft.sto.model.record.ImportModel;
 import com.shinsoft.sto.model.system.ResultJSON;
 import com.shinsoft.sto.service.record.InrecordService;
+import com.shinsoft.sto.tools.ExcelExportTools;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @RestController
 @RequestMapping("/InRecord")
 public class InRecordController {
 
+    @Autowired
+    private ExcelExportTools excelExportTools;
+
     @Autowired
     private InrecordService inrecordService;
 
@@ -53,6 +60,22 @@ public class InRecordController {
         return belongId;
     }
 
+    private String resolveUserId(HttpServletRequest request) {
+        String userId = (String) request.getHeader("userId");
+        if (userId == null) {
+            userId = (String) request.getAttribute("userId");
+        }
+        return userId;
+    }
+
+    private String resolveUserName(HttpServletRequest request) {
+        String userId = (String) request.getHeader("userName");
+        if (userId == null) {
+            userId = (String) request.getAttribute("userName");
+        }
+        return userId;
+    }
+
     @SuppressWarnings("unchecked")
     private Map<String, Object> buildQueryParams(String params, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
@@ -62,5 +85,79 @@ public class InRecordController {
 //        map.put("belongId", resolveBelongId(request));
         return map;
     }
+
+    /**
+     * 下载导入模板
+     */
+    @RequestMapping("/exportExcel")
+    public void exportExcel(HttpServletResponse response) {
+        try {
+            List<ImportModel> list = new ArrayList<>();
+            excelExportTools.exportExcel(response, list, "入库模板", "入库模板", ImportModel.class);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
+    /**
+     * Excel文件上传
+     */
+    @RequestMapping("/uploadExcel")
+    public ResultJSON uploadExcel(MultipartFile file, HttpServletRequest request) {
+        try {
+            if (file == null || file.isEmpty()) {
+                return ResultJSON.error("请选择要上传的文件");
+            }
+
+            // 验证文件类型
+            String fileName = file.getOriginalFilename();
+            if (fileName == null || (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx"))) {
+                return ResultJSON.error("请上传Excel文件(.xls 或 .xlsx)");
+            }
+
+            // 解析Excel文件
+            List<ImportModel> dataList = excelExportTools.parseExcelFile(file);
+            return ResultJSON.success(dataList);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("文件上传失败：" + ex.getMessage());
+        }
+    }
+
+
+
+
+//    /**
+//     * 单张入库
+//     */
+//    @RequestMapping("/in")
+//    public ResultJSON in( String json, HttpServletRequest request) {
+//        try {
+//            String belongId = resolveBelongId(request);
+//            String userId = resolveUserId(request);
+//            return inrecordService.in(userId, json, belongId);
+//        } catch (Exception ex) {
+//            ex.printStackTrace();
+//            return ResultJSON.error("入库失败：" + ex.getMessage());
+//        }
+//    }
+//
+    /**
+     * 批量入库
+     */
+    @PostMapping("/batchInStore")
+    public ResultJSON batchInStore( @RequestParam("dataList") String json, HttpServletRequest request) {
+        try {
+            List<ImportModel> dataList = JSON.parseArray(json, ImportModel.class);
+            String userId = resolveUserId(request);
+            String belongId = resolveBelongId(request);
+            String userName = resolveUserName(request);
+            return inrecordService.batchInStore(userId, dataList, belongId,userName);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("入库失败：" + ex.getMessage());
+        }
+    }
+
 }
 

sto/src/main/java/com/shinsoft/sto/model/main/Customer.java

@@ -16,6 +16,9 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "仓库客户", description = "仓库客户基本信息表")
 public class Customer extends BaseModel {
 
+    @ApiModelProperty
+    private String id;
+
     @ApiModelProperty("客户名称")
     private String customerNm;
     @ApiModelProperty("客户简称")

sto/src/main/java/com/shinsoft/sto/model/main/Stack.java

@@ -50,6 +50,7 @@ public class Stack extends BaseModel {
 
     private String isLayer;
 
+    @TableField(exist = false)
     private Integer onStackAmt;
 
 }

sto/src/main/java/com/shinsoft/sto/model/main/Ware.java

@@ -16,6 +16,8 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "仓库", description = "仓库基本信息表")
 public class Ware extends BaseModel {
 
+    @ApiModelProperty
+    private String id;
     @ApiModelProperty("库房名称")
     private String wareNm;
     @ApiModelProperty("库房编码")

sto/src/main/java/com/shinsoft/sto/model/record/ImportModel.java

@@ -0,0 +1,94 @@
+package com.shinsoft.sto.model.record;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ImportModel {
+
+    @ExcelProperty(value = "仓库名称", index = 0)
+    @ColumnWidth(15)
+    private String wareName;
+
+    @ExcelProperty(value = "垛位号", index = 1)
+    @ColumnWidth(15)
+    private String stackName;
+
+    @ExcelProperty(value = "层号", index = 2)
+    @ColumnWidth(15)
+    private String layerNo;
+
+    @ExcelProperty(value = "物料名称", index = 3)
+    @ColumnWidth(15)
+    private String materialName;
+
+    @ExcelProperty(value = "钢种", index = 4)
+    private String stGrade;
+
+    @ExcelProperty(value = "规格", index = 5)
+    private String attrib03;
+
+    @ExcelProperty(value = "数量", index = 6)
+    private BigDecimal quantity;
+
+    @ExcelProperty(value = "重量(默认吨)", index = 7)
+    @ColumnWidth(20)
+    private BigDecimal weight;
+
+    @ExcelProperty(value = "入库车号", index = 8)
+    @ColumnWidth(15)
+    private String inTruckNo;
+
+    @ExcelProperty(value = "货权公司", index = 9)
+    @ColumnWidth(15)
+    private String ownerCompany;
+
+    @ExcelProperty(value = "收货公司", index = 10)
+    @ColumnWidth(15)
+    private String receivingCompany;
+
+    @ExcelProperty(value = "材料号", index = 11)
+    @ColumnWidth(15)
+    private String prodNo;
+
+    @ExcelProperty(value = "订单号", index = 12)
+    @ColumnWidth(15)
+    private String attrib01;
+
+    @ExcelProperty(value = "合约号", index = 13)
+    @ColumnWidth(15)
+    private String attrib02;
+
+    @ExcelProperty(value = "捆绑包号", index = 14)
+    @ColumnWidth(15)
+    private String attrib04;
+
+    @ExcelProperty(value = "收货地址", index = 15)
+    @ColumnWidth(15)
+    private String deliveryAddress;
+
+    @ExcelProperty(value = "产地", index = 16)
+    @ColumnWidth(15)
+    private String attrib05;
+
+    @ExcelProperty(value = "备注", index = 17)
+    @ColumnWidth(15)
+    private String remark1;
+
+    @ExcelProperty(value = "垛位备注", index = 18)
+    @ColumnWidth(15)
+    private String remark2;
+
+    @ExcelProperty(value = "入库/理货人员", index = 19)
+    @ColumnWidth(15)
+    private String inUser;
+//
+}

sto/src/main/java/com/shinsoft/sto/model/record/Inrecord.java

@@ -122,14 +122,19 @@ public class Inrecord extends BaseModel {
     private String attrib25;
 
     @ApiModelProperty("备注1")
+    @TableField("REMARK_1")
     private String remark1;
     @ApiModelProperty("备注2")
+    @TableField("REMARK_2")
     private String remark2;
     @ApiModelProperty("备注3")
+    @TableField("REMARK_3")
     private String remark3;
     @ApiModelProperty("备注4")
+    @TableField("REMARK_4")
     private String remark4;
     @ApiModelProperty("备注5")
+    @TableField("REMARK_5")
     private String remark5;
 
     @TableField(exist = false)

sto/src/main/java/com/shinsoft/sto/model/ware/ChangeRecord.java

@@ -17,6 +17,12 @@ import java.math.BigDecimal;
 @ApiModel(value = "ChangeRecord", description = "材料操作表")
 public class ChangeRecord extends BaseModel {
 
+    @ApiModelProperty("ID")
+    private String id;
+
+    @ApiModelProperty("材料ID")
+    private String prodId;
+
     @ApiModelProperty("材料号/批号")
     private String prodNo;
 

sto/src/main/java/com/shinsoft/sto/model/ware/ProdMaster.java

@@ -17,6 +17,9 @@ import java.util.Date;
 @ApiModel(value = "ProdMaster", description = "材料信息表")
 public class ProdMaster extends BaseModel {
 
+    @ApiModelProperty("主键ID")
+    private String id;
+
     @ApiModelProperty("材料号/批号")
     private String prodNo;
 
@@ -62,6 +65,12 @@ public class ProdMaster extends BaseModel {
     @ApiModelProperty("出库标记位")
     private String outFlag;
 
+    @ApiModelProperty("销毁状态")
+    private String cancelFlag;
+
+    @ApiModelProperty("belong_id")
+    private String belongId;
+
     @ApiModelProperty("材料属性01")
     private String attrib_01;
 

sto/src/main/java/com/shinsoft/sto/model/ware/StoreChange.java

@@ -8,6 +8,8 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @Getter
 @Setter
 @Accessors(chain = true)
@@ -27,5 +29,63 @@ public class StoreChange extends BaseModel {
     @ApiModelProperty("层号")
     private String layerNo;
 
+    // 从建表SQL补充的字段
+    @ApiModelProperty("添加人ID")
+    private String addId;
+
+    @ApiModelProperty("添加人工号")
+    private String addCode;
+
+    @ApiModelProperty("添加人姓名")
+    private String addName;
+
+    @ApiModelProperty("添加人部门ID")
+    private String addDeptId;
+
+    @ApiModelProperty("添加人部门编号")
+    private String addDeptCode;
+
+    @ApiModelProperty("添加人部门名称")
+    private String addDeptName;
+
+    @ApiModelProperty("添加时间")
+    private Date addTime;
+
+    @ApiModelProperty("修改人ID")
+    private String modifyId;
+
+    @ApiModelProperty("修改人工号")
+    private String modifyCode;
+
+    @ApiModelProperty("修改人姓名")
+    private String modifyName;
+
+    @ApiModelProperty("修改时间")
+    private Date modifyTime;
+
+    @ApiModelProperty("取消人ID")
+    private String cancelId;
+
+    @ApiModelProperty("取消人工号")
+    private String cancelCode;
+
+    @ApiModelProperty("取消人姓名")
+    private String cancelName;
+
+    @ApiModelProperty("取消时间")
+    private Date cancelTime;
+
+    @ApiModelProperty("取消标志")
+    private String cancelFlag;
+
+    @ApiModelProperty("流程实例ID")
+    private String processInstanceId;
+
+    @ApiModelProperty("流程实例状态")
+    private String processInstanceStatus;
+
+    @ApiModelProperty("归属ID")
+    private String belongId;
 }
 
+

sto/src/main/java/com/shinsoft/sto/service/impl/record/InrecordServiceImpl.java

@@ -1,20 +1,70 @@
 package com.shinsoft.sto.service.impl.record;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.shinsoft.sto.mapper.main.CustomerMapper;
+import com.shinsoft.sto.mapper.main.MaterialMapper;
+import com.shinsoft.sto.mapper.main.StackMapper;
+import com.shinsoft.sto.mapper.main.WareMapper;
 import com.shinsoft.sto.mapper.record.InrecordMapper;
+import com.shinsoft.sto.mapper.ware.ChangeRecordMapper;
+import com.shinsoft.sto.mapper.ware.ProdMasterMapper;
+import com.shinsoft.sto.mapper.ware.StoreChangeMapper;
+import com.shinsoft.sto.model.main.Customer;
+import com.shinsoft.sto.model.main.Material;
+import com.shinsoft.sto.model.main.Stack;
+import com.shinsoft.sto.model.main.Ware;
+import com.shinsoft.sto.model.record.ImportModel;
 import com.shinsoft.sto.model.record.Inrecord;
 import com.shinsoft.sto.model.system.ResponseCodeMsg;
 import com.shinsoft.sto.model.system.ResultJSON;
+import com.shinsoft.sto.model.ware.ChangeRecord;
+import com.shinsoft.sto.model.ware.ProdMaster;
+import com.shinsoft.sto.model.ware.StoreChange;
 import com.shinsoft.sto.service.record.InrecordService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 @Service
 public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> implements InrecordService {
 
+//    材料信息
+    @Autowired
+    private ProdMasterMapper prodMasterMapper;
+//  入库记录
+    @Autowired
+    private InrecordMapper inrecordMapper;
+//    库存
+    @Autowired
+    private StoreChangeMapper storeChangeMapper;
+//    材料操作记录
+    @Autowired
+    private ChangeRecordMapper changeRecordMapper;
+//    客户信息
+    @Autowired
+    private CustomerMapper customerMapper;
+//    物料
+    @Autowired
+    private MaterialMapper MaterialMapper;
+//    仓库
+    @Autowired
+    private WareMapper wareMapper;
+//    垛位
+    @Autowired
+    private StackMapper stackMapper;
+
     @Override
     public ResultJSON query(int page, int rows, Map<String,Object> map) {
         try {
@@ -37,5 +87,238 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
             return ResultJSON.error(ResponseCodeMsg.CODE_EX, ex.getMessage());
         }
     }
+
+    @Override
+    @Transactional
+    public ResultJSON batchInStore(String userId, List<ImportModel> dataList, String belongId,String userName) {
+        try {
+            if(ObjectUtils.isEmpty(dataList)){
+                return ResultJSON.error(ResponseCodeMsg.CODE_EX, "数据为空");
+            }
+            for (ImportModel model : dataList){
+                /**
+                 * 数据校验
+                 */
+//          1.材料号不能为空且不能和库内信息重复(根据材料号查询材料表中是否具有重复数据)
+                if(StringUtils.isEmpty(model.getProdNo())){
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "材料号不能为空");
+                }
+//              查询重复数据 未取消入库 , 未出库 , 材料号相同的数据
+                ProdMaster prodMasters = prodMasterMapper.selectOne(
+                        new QueryWrapper<ProdMaster>().
+                        eq("prod_no", model.getProdNo()).
+                        eq("cancel_flag", "0").
+                        eq("in_flag", "0").
+                        eq("out_flag", "0").
+                        eq("belong_id", belongId));
+                if (prodMasters!= null) {
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, model.getProdNo()+"材料已入库");
+                }
+
+//          2.货权公司、收货公司、客户公司不能为空且该客户要在系统中维护了
+                if(StringUtils.isEmpty(model.getOwnerCompany()) || StringUtils.isEmpty(model.getReceivingCompany())){
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "货权公司、收货公司不能为空");
+                }
+//                根据客户名称查询客户信息
+                Customer customer = customerMapper.selectOne(
+                        new QueryWrapper<Customer>()
+                        .eq("CUSTOMER_NM", model.getOwnerCompany())
+                        .eq("cancel_flag", "0")
+                        .eq("belong_id", belongId));
+                if (customer == null){
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "["+model.getOwnerCompany()+"],暂未维护");
+                }
+                Customer customer1 = customerMapper.selectOne(
+                        new QueryWrapper<Customer>()
+                                .eq("CUSTOMER_NM", model.getReceivingCompany())
+                                .eq("cancel_flag", "0")
+                                .eq("belong_id", belongId));
+                if (customer1 == null){
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "["+model.getReceivingCompany()+"],暂未维护");
+                }
+//          3.物料品种要进行维护，此处跟钢种信息有关系;
+                Material material = MaterialMapper.selectOne(
+                        new QueryWrapper<Material>().
+                                eq("material_name", model.getMaterialName()).
+                                eq("MATERIAL_STANDARD", model.getStGrade()).
+                                eq("cancel_flag", "0").
+                                eq("belong_id", belongId));
+                if (material == null){
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "["+model.getMaterialName()+"]物料信息,暂未维护");
+                }
+//          4.入库数量和入库重量必须有且要大于0，这部分关系到所有统计相关的内容;
+                if ((model.getQuantity() != null && model.getQuantity().compareTo(BigDecimal.ZERO) <= 0) ||
+                    (model.getWeight()!=null && model.getWeight().compareTo(BigDecimal.ZERO) <= 0)) {
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "数量和重量必须大于0");
+                }
+
+
+
+//                拼接材料信息
+                ProdMaster prodMaster = prodSplice(model,userId,belongId,material,customer,customer1,userName);
+                int insert = prodMasterMapper.insert(prodMaster);
+                if (insert <= 0) {
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "入库失败");
+                }
+//                拼接入库记录
+                Inrecord inrecord = inRecordSplice(model, userId, belongId,material,customer,customer1,userName);
+                int insert1 = inrecordMapper.insert(inrecord);
+                if (insert1 <= 0) {
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "入库失败");
+                }
+//                拼接库存信息
+                StoreChange storeChange = storeChangeSplice(model, userId, belongId,prodMaster,userName);
+                int insert2 = storeChangeMapper.insert(storeChange);
+                if (insert2 <= 0) {
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "入库失败");
+                }
+//                拼接操作记录
+                ChangeRecord changeRecord = changeRecordSplice(model, userId, belongId,customer,customer1,userName, material,prodMaster);
+                int insert3 = changeRecordMapper.insert(changeRecord);
+                if (insert3 <= 0){
+                    return ResultJSON.error(ResponseCodeMsg.CODE_EX, "入库失败");
+                }
+                return ResultJSON.success(ResponseCodeMsg.CODE_SUCCESS, "入库成功");
+
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 拼接材料信息
+     */
+    public ProdMaster prodSplice(ImportModel importModel,String userId,String belongId,Material material,Customer customer,Customer customer1,String userName){
+        ProdMaster prodMaster = new ProdMaster();
+        prodMaster.setId(UUID.randomUUID().toString().replace("-", ""));
+        prodMaster.setProdNo(importModel.getProdNo());
+        prodMaster.setMaterialId(material.getId());
+        prodMaster.setStGrade(material.getMaterialStandard());
+        prodMaster.setOwnerCompany(customer.getId());
+        prodMaster.setReceivingCompany(customer1.getId());
+        prodMaster.setCustomerCompany(customer1.getId());
+        if(importModel.getDeliveryAddress()!=null){
+            prodMaster.setDeliveryAddress(importModel.getDeliveryAddress());
+        }else{
+            prodMaster.setDeliveryAddress(customer1.getDefaultAddress());
+        }
+        prodMaster.setWeight(importModel.getWeight());
+        prodMaster.setQuantity(importModel.getQuantity());
+        prodMaster.setAttrib_01(importModel.getAttrib01());
+        prodMaster.setAttrib_02(importModel.getAttrib02());
+        prodMaster.setAttrib_03(importModel.getAttrib03());
+        prodMaster.setAttrib_04(importModel.getAttrib04());
+        prodMaster.setAttrib_05(importModel.getAttrib05());
+        if(importModel.getInUser()!=null){
+            prodMaster.setInUserName(importModel.getInUser());
+        }else{
+            prodMaster.setInUserName(userName);
+        }
+        prodMaster.setInTruckNo(importModel.getInTruckNo());
+        prodMaster.setInFlag("0");
+        prodMaster.setLockFlag("0");
+        prodMaster.setOutFlag("0");
+        prodMaster.setCancelFlag("0");
+        prodMaster.setBelongId(belongId);
+        prodMaster.setInDtm(new Date());
+//        prodMaster.setProcessInstanceStatus("00");
+        prodMaster.setAddId(userId);
+        prodMaster.setRemark_1(importModel.getRemark1());
+
+        return prodMaster;
+    }
+    /**
+     * 拼接入库记录
+     */
+    public Inrecord inRecordSplice(ImportModel importModel,String userId,String belongId,Material material,Customer customer,Customer customer1,String userName){
+        Inrecord inrecord = new Inrecord();
+        inrecord.setAddId(userId);
+        inrecord.setId(UUID.randomUUID().toString().replace("-", ""));
+        inrecord.setInTruckNo(importModel.getInTruckNo());
+        inrecord.setBelongId(belongId);
+        inrecord.setInWareName(importModel.getWareName());
+        inrecord.setInStackName(importModel.getStackName());
+        inrecord.setInLayerNo(importModel.getLayerNo());
+        inrecord.setProdNo(importModel.getProdNo());
+        inrecord.setOwnerCompany(customer.getId());
+        inrecord.setReceivingCompany(customer1.getId());
+        inrecord.setCustomerCompany(customer1.getId());
+        inrecord.setMaterialId(material.getId());
+        inrecord.setStGrade(material.getMaterialStandard());
+        inrecord.setInWeight(importModel.getWeight());
+        inrecord.setInQuantity(importModel.getQuantity());
+        inrecord.setInFlag("0");
+        inrecord.setDeliveryAddress(importModel.getDeliveryAddress());
+        inrecord.setRemark1(importModel.getRemark1());
+        inrecord.setAddTime(new Date());
+        inrecord.setInDtm(new Date());
+        if(importModel.getInUser()!=null){
+            inrecord.setTallyPeople(importModel.getInUser());
+        }else{
+            inrecord.setTallyPeople(userName);
+        }
+        return inrecord;
+    }
+
+    /**
+     * 拼接库存信息
+     */
+    public StoreChange storeChangeSplice(ImportModel importModel,String userId,String belongId,ProdMaster prodMaster,String userName){
+        StoreChange storeChange = new StoreChange();
+        storeChange.setId(UUID.randomUUID().toString().replace("-", ""));
+        storeChange.setStoreId(prodMaster.getId());
+//        查询仓库id
+        Ware ware = wareMapper.selectOne(new QueryWrapper<>(Ware.class).eq("ware_nm", importModel.getWareName()).eq("cancel_flag", "0").eq("belong_id", belongId));
+        storeChange.setWareId(ware.getId());
+//        查询垛位id
+        Stack stack = stackMapper.selectOne(new QueryWrapper<>(Stack.class).eq("ware_id", ware.getId()).eq("name", importModel.getStackName()).eq("cancel_flag", "0").eq("belong_id", belongId));
+        storeChange.setStackId(stack.getId());
+        storeChange.setAddId(userId);
+        storeChange.setAddTime(new Date());
+        storeChange.setBelongId(belongId);
+        storeChange.setCancelFlag("0");
+        if(importModel.getInUser()!=null){
+            storeChange.setAddName(importModel.getInUser());
+        }else{
+            storeChange.setAddName(userName);
+        }
+        return storeChange;
+    }
+
+    /**
+     * 拼接操作记录
+     */
+    public ChangeRecord changeRecordSplice(ImportModel importModel,String userId,String belongId,Customer customer,Customer customer1,String userName,Material material,ProdMaster prodMaster){
+        ChangeRecord changeRecord = new ChangeRecord();
+        changeRecord.setId(UUID.randomUUID().toString().replace("-", ""));
+        changeRecord.setAddId(userId);
+        changeRecord.setAddTime(new Date());
+        changeRecord.setBelongId(belongId);
+        changeRecord.setChangeFlag("01");
+        changeRecord.setChangeNote("入库");
+        changeRecord.setCancelFlag("0");
+        changeRecord.setCntNum(1);
+        changeRecord.setProdNo(importModel.getProdNo());
+        changeRecord.setNewWareName(importModel.getWareName());
+        changeRecord.setNewStackName(importModel.getStackName());
+        changeRecord.setNewLayerNo(importModel.getLayerNo());
+        changeRecord.setOwnerCompany(customer.getId());
+        changeRecord.setReceivingCompany(customer1.getId());
+        changeRecord.setCustomerCompany(customer1.getId());
+        changeRecord.setMaterialId(material.getId());
+        changeRecord.setStGrade(material.getMaterialStandard());
+        changeRecord.setWeight(importModel.getWeight());
+        changeRecord.setQuantity(importModel.getQuantity());
+        changeRecord.setDeliveryAddress(importModel.getDeliveryAddress());
+        if(importModel.getInUser()!=null){
+            changeRecord.setAddName(importModel.getInUser());
+        }else{
+            changeRecord.setAddName(userName);
+        }
+        changeRecord.setProdId(prodMaster.getId());
+        return changeRecord;
+    }
 }
 

sto/src/main/java/com/shinsoft/sto/service/record/InrecordService.java

@@ -1,7 +1,9 @@
 package com.shinsoft.sto.service.record;
 
+import com.shinsoft.sto.model.record.ImportModel;
 import com.shinsoft.sto.model.system.ResultJSON;
 
+import java.util.List;
 import java.util.Map;
 
 public interface InrecordService {
@@ -11,5 +13,8 @@ public interface InrecordService {
                      Map<String,Object> map);
 
     ResultJSON statistics(Map<String,Object> map);
+
+
+    ResultJSON batchInStore(String userId, List<ImportModel> dataList, String belongId,String userName);
 }
 

sto/src/main/java/com/shinsoft/sto/tools/ExcelExportTools.java

@@ -0,0 +1,88 @@
+package com.shinsoft.sto.tools;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.shinsoft.sto.model.record.ImportModel;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+@Component
+public class ExcelExportTools {
+
+    /**
+     * 导出 Excel
+     * @param response HttpServletResponse
+     * @param dataList 数据列表
+     * @param fileName 文件名
+     * @param sheetName sheet名称
+     * @param clazz 实体类类型
+     */
+    public <T> void exportExcel(HttpServletResponse response,
+                                List<T> dataList,
+                                String fileName,
+                                String sheetName,
+                                Class<T> clazz) throws IOException {
+
+        // 设置响应头
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString())
+                .replaceAll("\\+", "%20");
+        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + encodedFileName + ".xlsx");
+
+        // 写入 Excel
+        EasyExcel.write(response.getOutputStream(), clazz)
+                .sheet(sheetName)
+                .doWrite(dataList);
+    }
+
+    /**
+     * 导出到多个 Sheet
+     */
+    public <T> void exportExcelMultiSheet(HttpServletResponse response,
+                                          List<List<T>> dataLists,
+                                          String fileName,
+                                          List<String> sheetNames,
+                                          Class<T> clazz) throws IOException {
+
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.toString())
+                .replaceAll("\\+", "%20");
+        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + encodedFileName + ".xlsx");
+
+        ExcelWriter excelWriter = null;
+        try {
+            excelWriter = EasyExcel.write(response.getOutputStream(), clazz).build();
+
+            for (int i = 0; i < dataLists.size(); i++) {
+                WriteSheet writeSheet = EasyExcel.writerSheet(i, sheetNames.get(i))
+                        .head(clazz)
+                        .build();
+                excelWriter.write(dataLists.get(i), writeSheet);
+            }
+        } finally {
+            if (excelWriter != null) {
+                excelWriter.finish();
+            }
+        }
+    }
+
+    /**
+     * 解析Excel文件
+     */
+    public List<ImportModel> parseExcelFile(MultipartFile file) throws Exception {
+        // 使用EasyExcel解析文件
+        return EasyExcel.read(file.getInputStream())
+                .head(ImportModel.class)
+                .sheet()
+                .doReadSync();
+    }
+}