凯和商务导入箱明细

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/KHTWarehousebillsController.java

@@ -1,21 +1,32 @@
 package com.ruoyi.web.controller.shipping.controller;
 
+import java.io.*;
 import java.util.List;
 import java.util.Map;
 
 import com.ruoyi.basicData.domain.TCorps;
 import com.ruoyi.basicData.service.ITCorpsService;
 import com.ruoyi.basicData.service.ITGoodsService;
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.shipping.domain.TCntrno;
+import com.ruoyi.shipping.domain.TWarehousebillsCntritems;
+import com.ruoyi.shipping.excel.TWarehousebillsCntritemsExcel;
+import com.ruoyi.shipping.service.ITWarehousebillsCntritemsService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
 import com.sun.jna.platform.unix.solaris.LibKstat;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -23,6 +34,10 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 凯和订单Controller
@@ -30,6 +45,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @author ruoyi
  * @date 2021-04-08
  */
+@Slf4j
 @RestController
 @RequestMapping("/khwarehouse/warehousebills")
 public class KHTWarehousebillsController extends BaseController
@@ -40,6 +56,10 @@ public class KHTWarehousebillsController extends BaseController
     private ITCorpsService itCorpsService;
     @Autowired
     private ITGoodsService itGoodsService;
+    @Autowired
+    private ITWarehousebillsCntritemsService tWarehousebillsCntritemsService;
+    @Value("${ruoyi.downloadPath}")
+    private String downloadPath;
 
     /**
      * 查询凯和订单列表
@@ -310,4 +330,35 @@ public class KHTWarehousebillsController extends BaseController
         return tWarehousebillsService.updateOrderMessage(tWarehouseBills);
 
     }
+    /**
+     * 凯和商务版导入【箱信息】Excel
+     */
+    @PostMapping(value = "/importCreate")
+    public AjaxResult importCreateCompanyMsg(@RequestParam("file") MultipartFile file)throws Exception
+    {
+        return tWarehousebillsService.importCreateCompanyMsg(file);
+    }
+    /**
+     * 下载箱信息导入模板
+     */
+    @GetMapping("/importTCntrnoTemplate")
+    public AjaxResult importTCntrnoTemplate()
+    {
+        ExcelUtil<TWarehousebillsCntritemsExcel> util = new ExcelUtil<TWarehousebillsCntritemsExcel>(TWarehousebillsCntritemsExcel.class);
+        return util.importTemplateExcel("商务版箱信息数据模板");
+    }
+    @GetMapping("/download")
+    public AjaxResult download(String fileName) {
+        String filePath = RuoYiConfig.getDownloadPath() + fileName;
+        File file = new File(filePath);
+        if (!file.exists()){
+            AjaxResult ajaxResult = this.importTCntrnoTemplate();
+            String code = ajaxResult.get("code").toString();
+            if ("500".equals(code)) {
+                return AjaxResult.error("下载摸版失败");
+            }
+        }
+        String path = downloadPath+fileName;
+        return AjaxResult.success("success",path);
+    }
 }

ruoyi-admin/src/main/resources/application.yml

@@ -17,6 +17,8 @@ ruoyi:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  #凯和下载摸版路径
+  downloadPath: https://test.ke.tubaosoft.com/profile/download/
 
 # 开发环境配置
 server:

ruoyi-shipping/src/main/java/com/ruoyi/shipping/domain/TWarehousebillsCntritems.java

@@ -22,7 +22,7 @@ public class TWarehousebillsCntritems extends BaseEntity
     private Long fId;
 
     /** 凯和订单从表主键 */
-    @Excel(name = "凯和订单从表主键")
+    /*@Excel(name = "凯和订单从表主键")*/
     private Long fPid;
 
     /** 箱号 */
@@ -34,68 +34,71 @@ public class TWarehousebillsCntritems extends BaseEntity
     private String fSealno;
 
     /** 取品名表的id */
-    @Excel(name = "取品名表的id")
+    /*@Excel(name = "取品名表的id")*/
     private Long fGoodsid;
 
     /** 包装(取数据字典) */
-    @Excel(name = "包装(取数据字典)")
+    /*@Excel(name = "包装(取数据字典)")*/
     private String fPackageid;
 
     /** 箱型(t_cntr 集装箱id) */
-    @Excel(name = "箱型(t_cntr 集装箱id)")
+    /*@Excel(name = "箱型(t_cntr 集装箱id)")*/
     private Long fCntrid;
 
     /** 箱数 */
-    @Excel(name = "箱数")
+    /*@Excel(name = "箱数")*/
     private Long fCntrcount;
 
     /** 单箱重(吨不能超过40) */
-    @Excel(name = "单箱重(吨不能超过40)")
+    @Excel(name = "单箱重")
     private BigDecimal fCntrweight;
 
     /** 箱状态 */
-    @Excel(name = "箱状态")
+    /*@Excel(name = "箱状态")*/
     private String fCntrstatus;
 
     /** 是否自备箱 */
-    @Excel(name = "是否自备箱")
+    /*@Excel(name = "是否自备箱")*/
     private String fSoc;
 
     /** 温度 */
-    @Excel(name = "温度")
+    /*@Excel(name = "温度")*/
     private String fTemperature;
 
     /** 风门开度(%) */
-    @Excel(name = "风门开度(%)")
+    /*@Excel(name = "风门开度(%)")*/
     private String fDraught;
 
     /** 湿度设置(%) */
-    @Excel(name = "湿度设置(%)")
+    /*@Excel(name = "湿度设置(%)")*/
     private String fHumidity;
 
     /** 是否预冷(冻柜显示) */
-    @Excel(name = "是否预冷(冻柜显示)")
+    /*@Excel(name = "是否预冷(冻柜显示)")*/
     private String fPrecooling;
 
     /** 预计提箱日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预计提箱日期", width = 30, dateFormat = "yyyy-MM-dd")
+    /*@Excel(name = "预计提箱日期", width = 30, dateFormat = "yyyy-MM-dd")*/
     private Date fPlantakecntr;
 
     /** 是否危险品 */
-    @Excel(name = "是否危险品")
+    /*@Excel(name = "是否危险品")*/
     private String fIfdanger;
     //货物名称
+    @Excel(name = "货名")
     private String goodsName;
     //包装中文名
+    @Excel(name = "包装类型")
     private String packageName;
     //集装箱编号
+    @Excel(name = "箱型")
     private String cntrName;
     //是否预冷
     private String precoolingName;
     //是否危险品
     private String ifdangerName;
-    @Excel(name = "是否人工")
+    /*@Excel(name = "是否人工")*/
     private Long fManual;
 
     public Long getfManual() {

ruoyi-shipping/src/main/java/com/ruoyi/shipping/excel/TWarehousebillsCntritemsExcel.java

@@ -0,0 +1,132 @@
+package com.ruoyi.shipping.excel;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author ZhaoQian La
+ * @Date 2021/5/19 11:07
+ * @Version 1.0
+ */
+public class TWarehousebillsCntritemsExcel{
+    private static final long serialVersionUID = 1L;
+    /** 箱号 */
+    @Excel(name = "箱号")
+    private String fCntrno;
+
+    /** 封号 */
+    @Excel(name = "铅封号")
+    private String fSealno;
+
+    /** 取品名表的id */
+    /*@Excel(name = "取品名表的id")*/
+    private Long fGoodsid;
+
+    /** 包装(取数据字典) */
+    /*@Excel(name = "包装(取数据字典)")*/
+    private String fPackageid;
+
+    /** 箱型(t_cntr 集装箱id) */
+    /*@Excel(name = "箱型(t_cntr 集装箱id)")*/
+    private Long fCntrid;
+    /** 单箱重(吨不能超过40) */
+    @Excel(name = "单箱重(不得超过40)")
+    private BigDecimal fCntrweight;
+    @Excel(name = "货名")
+    private String goodsName;
+    //包装中文名
+    @Excel(name = "包装类型")
+    private String packageName;
+    //集装箱编号
+    @Excel(name = "箱型")
+    private String cntrName;
+
+    public String getfCntrno() {
+        return fCntrno;
+    }
+
+    public void setfCntrno(String fCntrno) {
+        this.fCntrno = fCntrno;
+    }
+
+    public String getfSealno() {
+        return fSealno;
+    }
+
+    public void setfSealno(String fSealno) {
+        this.fSealno = fSealno;
+    }
+
+    public Long getfGoodsid() {
+        return fGoodsid;
+    }
+
+    public void setfGoodsid(Long fGoodsid) {
+        this.fGoodsid = fGoodsid;
+    }
+
+    public String getfPackageid() {
+        return fPackageid;
+    }
+
+    public void setfPackageid(String fPackageid) {
+        this.fPackageid = fPackageid;
+    }
+
+    public Long getfCntrid() {
+        return fCntrid;
+    }
+
+    public void setfCntrid(Long fCntrid) {
+        this.fCntrid = fCntrid;
+    }
+
+    public BigDecimal getfCntrweight() {
+        return fCntrweight;
+    }
+
+    public void setfCntrweight(BigDecimal fCntrweight) {
+        this.fCntrweight = fCntrweight;
+    }
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public String getCntrName() {
+        return cntrName;
+    }
+
+    public void setCntrName(String cntrName) {
+        this.cntrName = cntrName;
+    }
+
+    @Override
+    public String toString() {
+        return "TWarehousebillsCntritemsExcel{" +
+                "fCntrno='" + fCntrno + '\'' +
+                ", fSealno='" + fSealno + '\'' +
+                ", fGoodsid=" + fGoodsid +
+                ", fPackageid='" + fPackageid + '\'' +
+                ", fCntrid=" + fCntrid +
+                ", fCntrweight=" + fCntrweight +
+                ", goodsName='" + goodsName + '\'' +
+                ", packageName='" + packageName + '\'' +
+                ", cntrName='" + cntrName + '\'' +
+                '}';
+    }
+}

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseBillsService.java

@@ -7,6 +7,7 @@ import com.ruoyi.warehouseBusiness.domain.TWareHouseExcelItems;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseBills;
 import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 import com.ruoyi.warehouseBusiness.excel.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 import java.util.Map;
@@ -401,4 +402,10 @@ public interface ITWarehouseBillsService {
      * @return
      */
     public AjaxResult revokeContainerPort(Long fId, String type);
+    /**
+     *  导入Excel生成箱信息
+     * @param file  excel
+     * @return  结果
+     */
+    public AjaxResult importCreateCompanyMsg(MultipartFile file) throws Exception;
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseBillsServiceImpl.java

@@ -31,6 +31,7 @@ import com.ruoyi.shipping.domain.TCntr;
 import com.ruoyi.shipping.domain.TVoyage;
 import com.ruoyi.shipping.domain.TWarehousebillsCntr;
 import com.ruoyi.shipping.domain.TWarehousebillsCntritems;
+import com.ruoyi.shipping.excel.TWarehousebillsCntritemsExcel;
 import com.ruoyi.shipping.mapper.TCntrMapper;
 import com.ruoyi.shipping.mapper.TVoyageMapper;
 import com.ruoyi.shipping.mapper.TWarehousebillsCntrMapper;
@@ -44,17 +45,26 @@ import com.ruoyi.warehouseBusiness.domain.*;
 import com.ruoyi.warehouseBusiness.excel.*;
 import com.ruoyi.warehouseBusiness.mapper.*;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.SpreadsheetVersion;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellReference;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.ruoyi.common.utils.poi.Excel.filter;
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -581,7 +591,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 line++;
                 if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                    return AjaxResult.error("箱型数据第" + line + "行数据缺少必填数据");
                 }
                 cntr.setfPid(fPid);
                 cntr.setfGoodsid(0L);
@@ -804,9 +814,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             // 存储业务类型（业务类型）
             auditItems.setRefno2(warehouseBills.getfBilltype());
             // 存储提单号（提单号）
-            if (StringUtils.isNotEmpty(warehouseBills.getfMblno())){
+            if (StringUtils.isNotEmpty(warehouseBills.getfMblno())) {
                 auditItems.setRefno3(warehouseBills.getfMblno());
-            }else {
+            } else {
                 auditItems.setRefno3(warehouseBills.getfBillno());
             }
             auditItems.setSendUserId(loginUser.getUser().getUserId());
@@ -848,9 +858,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntritems);
         List<TWarehousebillsCntritems> tWarehousebillsCntrs = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntritems.class);
         TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
-        if (tWarehouseBills.getfBillstatus()==7L
-                || tWarehouseBills.getfBillstatus()==6L) {
-        }else {
+        if (tWarehouseBills.getfBillstatus() == 7L
+                || tWarehouseBills.getfBillstatus() == 6L) {
+        } else {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("当前数据不允许暂存");
         }
@@ -1107,7 +1117,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 cntrLine++;
                 if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("箱型数据第"+cntrLine+"行数据缺少必填数据");
+                    return AjaxResult.error("箱型数据第" + cntrLine + "行数据缺少必填数据");
                 }
                 cntr.setfPid(fPid);
                 cntr.setfGoodsid(0L);
@@ -1545,7 +1555,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     /**
      * 集港业务撤销
      *
-     * @param fId 主表id
+     * @param fId  主表id
      * @param type
      * @return
      */
@@ -1594,6 +1604,103 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         return AjaxResult.success();
     }
 
+    @Override
+    public AjaxResult importCreateCompanyMsg(MultipartFile file) throws Exception {
+        List<TWarehousebillsCntritemsExcel> fleetCompanyMsgs = new ArrayList<>();
+
+        InputStream inputStream = null;
+         try {
+        inputStream = file.getInputStream();
+        String originalFilename = file.getOriginalFilename();
+        Workbook workbook = null;
+        if (originalFilename.endsWith("xls")){
+            workbook = WorkbookFactory.create(inputStream);
+        }else if (originalFilename.endsWith("xlsx")){
+            workbook = new XSSFWorkbook(inputStream);
+        }
+        Sheet sheet = workbook.getSheetAt(0);
+        int line = 0;
+        for (Row rows : sheet) {
+            line++;
+            if (rows.getRowNum() == 0) {
+                continue;
+            }
+            TWarehousebillsCntritemsExcel companyMsg = new TWarehousebillsCntritemsExcel();
+            for (int a = 0; a < rows.getPhysicalNumberOfCells(); a++) {
+                Cell cell = rows.getCell(a);
+                String value = filter(sheet.getRow(0), CellReference.convertNumToColString(cell.getColumnIndex()));
+                switch (value) {
+                    case "箱号":
+                        //设置单元格类型
+                        cell.setCellType(CellType.STRING);
+                        if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                            return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少箱号");
+                        }
+                        companyMsg.setfCntrno(cell.getStringCellValue());
+                        break;
+                    case "铅封号":
+                        //设置单元格类型
+                        cell.setCellType(CellType.STRING);
+                        if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                            return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少封号");
+                        }
+                        companyMsg.setfSealno(cell.getStringCellValue());
+                        break;
+                    case "单箱重(不得超过40)":
+                        //设置单元格类型
+                        cell.setCellType(CellType.STRING);
+                        if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                            return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少单箱重");
+                        }
+                        companyMsg.setfCntrweight(new BigDecimal(cell.getStringCellValue()));
+                        break;
+                    case "货名":
+                        //设置单元格类型
+                        cell.setCellType(CellType.STRING);
+                        if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                            return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少货名");
+                        }
+                        companyMsg.setGoodsName(cell.getStringCellValue());
+                        TGoods tGoods = tGoodsMapper.checkUFNnameUnique(companyMsg.getGoodsName());
+                        if (tGoods != null && tGoods.getfId() != null) {
+                            companyMsg.setfGoodsid(tGoods.getfId());
+                        }
+                        break;
+                    case "包装类型":
+                        //设置单元格类型
+                        cell.setCellType(CellType.STRING);
+                        if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                            return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少包装类型");
+                        }
+                        companyMsg.setPackageName(cell.getStringCellValue());
+                        String fPackageid = sysDictDataMapper.selectDictValue("f_packageid", companyMsg.getPackageName());
+                        if (StringUtils.isNotEmpty(fPackageid)) {
+                            companyMsg.setfPackageid(fPackageid);
+                        }
+                        break;
+                    case "箱型":
+                        //设置单元格类型
+                        cell.setCellType(CellType.STRING);
+                        if (StringUtils.isEmpty(cell.getStringCellValue())) {
+                            return AjaxResult.error("Excel箱信息数据第" + line + "行数据缺少箱型");
+                        }
+                        companyMsg.setCntrName(cell.getStringCellValue());
+                        Long fId = tCntrMapper.selectRcntrFId(companyMsg.getCntrName());
+                        if (fId != null) {
+                            companyMsg.setfCntrid(fId);
+                        }
+                        break;
+                }
+            }
+            fleetCompanyMsgs.add(companyMsg);
+        }
+            } catch (IOException e) {
+                return AjaxResult.error("上传文件失败,请检查文件是否损坏");
+            }
+        return AjaxResult.success("success", fleetCompanyMsgs);
+
+    }
+
     /**
      * app仓储新行提交业务
      *
@@ -1724,9 +1831,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 //应付信息
                 List<TWarehousebillsfees> warehousebillsfeesCr = tWarehousebillsfeesMapper.selectFeesByPId(warehouseBill.getfId(), "C");
                 warehouseBill.setWarehousebillsfeesCr(warehousebillsfeesCr);
-                if (CollectionUtils.isNotEmpty(tWarehousebillsfeesDr)){
+                if (CollectionUtils.isNotEmpty(tWarehousebillsfeesDr)) {
                     warehouseBill.setMoneyStatus(tWarehousebillsfeesDr.get(0).getfBillstatus());
-                }else if (CollectionUtils.isNotEmpty(warehousebillsfeesCr)){
+                } else if (CollectionUtils.isNotEmpty(warehousebillsfeesCr)) {
                     warehouseBill.setMoneyStatus(warehousebillsfeesCr.get(0).getfBillstatus());
                 }
             }
@@ -1755,7 +1862,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         bills.setfId(warehouseBills.getfId());
         bills.setfMblno(warehouseBills.getfMblno());
         Integer integer = tWarehouseBillsMapper.updateTWarehousebills(bills);
-        if (integer <=0){
+        if (integer <= 0) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return AjaxResult.error("维护提单号失败,请联系管理员");
         }
@@ -1779,12 +1886,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         TWarehousebillsfees warehousebillsfees = new TWarehousebillsfees();
         warehousebillsfees.setfPid(warehouseBills.getfId());
         List<TWarehousebillsfees> tWarehousebillsfees = tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(warehousebillsfees);
-        if (CollectionUtils.isNotEmpty(tWarehousebillsfees)){
+        if (CollectionUtils.isNotEmpty(tWarehousebillsfees)) {
             Long aLong = tWarehousebillsfees.get(0).getfBillstatus();
-            if (aLong == 4L || aLong == 5L){
+            if (aLong == 4L || aLong == 5L) {
                 return AjaxResult.error("订单费用审核中，不支持修改");
             }
-            if (aLong == 6L){
+            if (aLong == 6L) {
                 return AjaxResult.error("订单费用审核通过，不支持修改");
             }
         }
@@ -1826,14 +1933,15 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbDr);
             }
-            map.put("warehousebillsfeesDrList",warehousebillsfeesDrList);
+            map.put("warehousebillsfeesDrList", warehousebillsfeesDrList);
         }
-        return AjaxResult.success("success",map);
+        return AjaxResult.success("success", map);
     }
+
     @Override
     @Transactional
-    public AjaxResult ruoYiSubmitMessage(String tWarehousebills,String tWarehousebillsCntritems,String tWarehousebillsfeesCr,
-                                              String tWarehousebillsfeesDr,LoginUser loginUser,String billsType) {
+    public AjaxResult ruoYiSubmitMessage(String tWarehousebills, String tWarehousebillsCntritems, String tWarehousebillsfeesCr,
+                                         String tWarehousebillsfeesDr, LoginUser loginUser, String billsType) {
         boolean isApprove = false;
         String key = "";
         long actId = 0L;
@@ -1850,14 +1958,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
         if ("0".equals(sysConfig.getConfigValue())) {
             isApprove = true;
         }
-        if (isApprove){
+        if (isApprove) {
             billStatus = 4L;
-        }else {
+        } else {
             billStatus = 6L;
         }
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehousebills, TWarehouseBills.class);
-        Map<String ,Object> map = new HashMap<>();
-        if (StringUtils.isEmpty(warehouseBills.getfMblno())){
+        Map<String, Object> map = new HashMap<>();
+        if (StringUtils.isEmpty(warehouseBills.getfMblno())) {
             return AjaxResult.error("提单号不能为空");
         }
         TWarehouseBills mblno = tWarehouseBillsMapper.selectTWarehousebillsfMblno(warehouseBills);
@@ -1865,18 +1973,18 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("提单号已存在，请重新提交");
         }
         TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
-        if (tWarehouseBills.getfBillstatus() != 11L){
+        if (tWarehouseBills.getfBillstatus() != 11L) {
             return AjaxResult.error("订单未审核完成，暂不支持维护提单号");
         }
         TWarehouseBills bills = new TWarehouseBills();
         bills.setfId(warehouseBills.getfId());
         bills.setfMblno(warehouseBills.getfMblno());
         Integer integer = tWarehouseBillsMapper.updateTWarehousebills(bills);
-        map.put("tWarehouseBills",tWarehouseBills);
-        if (StringUtils.isNotEmpty(tWarehousebillsCntritems)){
+        map.put("tWarehouseBills", tWarehouseBills);
+        if (StringUtils.isNotEmpty(tWarehousebillsCntritems)) {
             JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntritems);
             List<TWarehousebillsCntritems> tWarehousebillsCntritemsList = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntritems.class);
-            if (CollectionUtils.isNotEmpty(tWarehousebillsCntritemsList)){
+            if (CollectionUtils.isNotEmpty(tWarehousebillsCntritemsList)) {
                 int cntritemsfPid = tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
                 for (TWarehousebillsCntritems warehousebillsCntritems : tWarehousebillsCntritemsList) {
                     warehousebillsCntritems.setfPid(warehouseBills.getfId());
@@ -1886,7 +1994,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
                 }
             }
-            map.put("tWarehousebillsCntritemsList",tWarehousebillsCntritemsList);
+            map.put("tWarehousebillsCntritemsList", tWarehousebillsCntritemsList);
         }
         int c = tWarehousebillsfeesMapper.deleteFessByFPid(warehouseBills.getfId(), "C");
         if (StringUtils.isNotNull(tWarehousebillsfeesCr) && !"[]".equals(tWarehousebillsfeesCr)) {
@@ -1907,7 +2015,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 }
                 tWarehousebillsfeesMapper.insertTWarehousebillsfees(wbCr);
             }
-            map.put("warehousebillsfeesCrList",warehousebillsfeesCrList);
+            map.put("warehousebillsfeesCrList", warehousebillsfeesCrList);
         }
         int d = tWarehousebillsfeesMapper.deleteFessByFPid(warehouseBills.getfId(), "D");
         if (StringUtils.isNotNull(tWarehousebillsfeesDr) && !"[]".equals(tWarehousebillsfeesDr)) {
@@ -1960,7 +2068,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             }
             return approvalFlow;
         }
-        return AjaxResult.success("success",map);
+        return AjaxResult.success("success", map);
     }
 
     @Override
@@ -1970,11 +2078,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return AjaxResult.error("提单号已存在，请重新提交");
         }
         TWarehouseBills warehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(tWarehouseBills.getfId());
-        if (warehouseBills.getfBillstatus() != 6L){
+        if (warehouseBills.getfBillstatus() != 6L) {
             return AjaxResult.error("下单未审核完成，暂不支持维护提单号");
         }
         int i = tWarehouseBillsMapper.updateTWarehousebills(tWarehouseBills);
-        if (i<=0){
+        if (i <= 0) {
             return AjaxResult.error("更新提单号出错,请找管理员");
         }
         return AjaxResult.success();
@@ -2208,10 +2316,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     /**
-     *  叫车进场
-     * @param item      明细数据
-     * @param attachs   附件
-     * @return  结果
+     * 叫车进场
+     *
+     * @param item    明细数据
+     * @param attachs 附件
+     * @return 结果
      */
     @Override
     @Transactional
@@ -2459,7 +2568,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 line++;
                 if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                    return AjaxResult.error("箱型数据第" + line + "行数据缺少必填数据");
                 }
                 cntr.setfPid(tWarehouseBills.getfId());
                 cntr.setfGoodsid(0L);
@@ -2706,7 +2815,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 line++;
                 if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                    return AjaxResult.error("箱型数据第" + line + "行数据缺少必填数据");
                 }
                 cntr.setfPid(tWarehouseBills.getfId());
                 cntr.setfGoodsid(0L);
@@ -2856,7 +2965,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 line++;
                 if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                    return AjaxResult.error("箱型数据第" + line + "行数据缺少必填数据");
                 }
                 cntr.setfPid(tWarehouseBills.getfId());
                 cntr.setfGoodsid(0L);
@@ -3623,7 +3732,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 line++;
                 if (StringUtils.isNull(cntr.getfCntrid()) || StringUtils.isNull(cntr.getfCntrcount()) || cntr.getfCntrcount() == 0) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                    return AjaxResult.error("箱型数据第"+line+"行数据缺少必填数据");
+                    return AjaxResult.error("箱型数据第" + line + "行数据缺少必填数据");
                 }
                 cntr.setfPid(tWarehousebills.getfId());
                 cntr.setfGoodsid(0L);
@@ -3798,14 +3907,14 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     @Transactional
-    public AjaxResult updateKaHeOrder(Long fPid, long fettle,Date auditItem ) {
+    public AjaxResult updateKaHeOrder(Long fPid, long fettle, Date auditItem) {
         if (StringUtils.isNull(fPid)) {
             return AjaxResult.error("协议更新状态未找到主表信息，请与管理员联系");
         }
         TWarehouseBills tWarehouseBills = new TWarehouseBills();
         tWarehouseBills.setfId(fPid);
         tWarehouseBills.setfBillstatus(fettle);
-        if (fettle==11L){
+        if (fettle == 11L) {
             tWarehouseBills.setfReviewDate(auditItem);
         }
         int tFeeUpdateResult = tWarehouseBillsMapper.updateKaHeOrder(tWarehouseBills);