增加对销售合同产品明细明细ExceL表的导入校验

src/main/java/com/example/backend/entity/common/CustCtrl.java

@@ -408,6 +408,47 @@ public class CustCtrl {
     @TableField(exist = false)
     private String countryName;
 
+    //商品编号
+    @TableField(exist = false)
+    private String itemno;
+
+    //中文品名
+    @TableField(exist = false)
+    private String sdesc;
+
+    //英文品名
+    @TableField(exist = false)
+    private String edesc;
+
+    //单位
+    @TableField(exist = false)
+    private String ut;
+
+    //海关编码
+    @TableField(exist = false)
+    private String hsCode;
+
+    //海关中文名称
+    @TableField(exist = false)
+    private String hsNameCn;
+
+    //海关英文名称
+    @TableField(exist = false)
+    private String hsNameEn;
+
+    //增值税率
+    @TableField(exist = false)
+    private BigDecimal inTaxRate;
+
+    //退税率
+    @TableField(exist = false)
+    private BigDecimal reTaxRate;
+
+    //对人民币税率
+    @TableField(exist = false)
+    private BigDecimal rate;
+
+
 
 
 

src/main/java/com/example/backend/excel/SalesDtlExcelDTO.java

@@ -33,10 +33,10 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("规格描述")
     private String spec;
 
-    @ExcelProperty("水分")
+    @ExcelProperty("水分%")
     private BigDecimal moisture;
 
-    @ExcelProperty("含铁量")
+    @ExcelProperty("含铁量%")
     private BigDecimal ironCont;
 
     @ExcelProperty("湿吨数量")
@@ -51,7 +51,7 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("数量")
     private BigDecimal qty;
 
-    @ExcelProperty("含税单价")
+    @ExcelProperty("销售单价")
     private BigDecimal soPrice;
 
     @ExcelProperty("不含税单价")
@@ -90,7 +90,7 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("进项税率%")
     private BigDecimal inTaxRate;
 
-    @ExcelProperty("退税率%")
+    @ExcelProperty("退税率 %")
     private BigDecimal reTaxRate;
 
     @ExcelProperty("销项税率%")
@@ -102,7 +102,7 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("流程实例id")
     private String processInstanceId;
 
-    @ExcelProperty("单据号")
+    @ExcelProperty("销售合同号")
     private String fno;
 
     @ExcelProperty("单据日期")
@@ -165,7 +165,7 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("合同批次号")
     private String batchNo;
 
-    @ExcelProperty("销售合同号")
+    @ExcelProperty("合同号")
     private String sono;
 
     @ExcelProperty("供应商代码")
@@ -201,10 +201,10 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("客户名称")
     private String ctName;
 
-    @ExcelProperty("币种采购")
+    @ExcelProperty("采购币种")
     private String curcyPo;
 
-    @ExcelProperty("汇率采购")
+    @ExcelProperty("采购汇率")
     private BigDecimal ratePo;
 
     @ExcelProperty("业务账套")
@@ -303,7 +303,7 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("H型钢规格")
     private String ftype2;
 
-    @ExcelProperty("规格")
+    @ExcelProperty("规格描述")
     private String ftype3;
 
     @ExcelProperty("计重方式")
@@ -312,7 +312,7 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("色标")
     private String ftype5;
 
-    @ExcelProperty("数值预留字段1")
+    @ExcelProperty("捆数")
     private BigDecimal fnum8;
 
     @ExcelProperty("数值预留字段2")
@@ -321,10 +321,10 @@ public class SalesDtlExcelDTO {
     @ExcelProperty("文本预留字段1")
     private String ftype6;
 
-    @ExcelProperty("文本预留字段2")
+    @ExcelProperty("螺纹规格库")
     private String ftype7;
 
-    @ExcelProperty("煤焦标准水分")
+    @ExcelProperty("煤焦计价水%")
     private BigDecimal coalMoisture;
 
     @ExcelProperty("钢厂资源号")

src/main/java/com/example/backend/mapper/contract/CustCtrlMapper.java

@@ -2,7 +2,6 @@ package com.example.backend.mapper.contract;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.backend.entity.common.CustCtrl;
-import com.example.backend.entity.common.DataDic;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -28,8 +27,11 @@ public interface CustCtrlMapper extends BaseMapper<CustCtrl> {
     List<CustCtrl> selectCommContrNo(@Param("commContrNo") String commContrNo);
 
 
+    List<CustCtrl> selectByItemno(@Param("itemno") String itemno, @Param("bizProductType") String bizProductType);
 
+    List<CustCtrl> selectByCurcyPo(@Param("curcyPo") String curcyPo);
 
+    List<CustCtrl> selectByResourceNo(@Param("resourceNo") String resourceNo, @Param("bizProductType") String bizProductType);
 
 
 }

src/main/java/com/example/backend/mapper/contract/DicMapper.java

@@ -28,10 +28,6 @@ public interface DicMapper extends BaseMapper<DataDic> {
     List<DataDic> selectBySettIndex(@Param("settIndex") String settIndex);
 
 
-
-
-
-
-
+    List<DataDic> selectByPriceMtd(@Param("priceMtd") String priceMtd);
 
 }

src/main/java/com/example/backend/service/contract/impl/SalesContractServiceImpl.java

@@ -54,7 +54,9 @@ public class SalesContractServiceImpl implements SalesContractService {
 
         List<String> errors = new ArrayList<>();  // 用来记录所有错误
 
-        Long contractId = null;
+        Long Id = null;
+        String bizProductType = null;
+        String bizType = null;
 
         try {
             // ================= 主表 =================
@@ -95,7 +97,9 @@ public class SalesContractServiceImpl implements SalesContractService {
                     if (bizProdictTypeList == null || bizProdictTypeList.isEmpty()) {
                         errors.add("输入的合同产品类型在数据字典中不存在！");
                     }
-
+                    if (bizProdictTypeList != null && !bizProdictTypeList.get(0).getItemValue().isEmpty()) {
+                        bizProductType = bizProdictTypeList.get(0).getItemValue();
+                    }
                     if (StringUtils.isEmpty(entity.getBizType())) {
                         errors.add("合同类型不能为空！");
                     }
@@ -294,27 +298,27 @@ public class SalesContractServiceImpl implements SalesContractService {
                     if ("代理-主业进口".equals(entity.getServiceType())) {
                         if (!StringUtils.isEmpty(entity.getAgentNo())) {
                             List<CustCtrl> agentNoList = custCtrlMapper.selectByAgentNo(entity.getAgentNo());
-                            if(agentNoList==null||agentNoList.isEmpty()){
+                            if (agentNoList == null || agentNoList.isEmpty()) {
                                 errors.add("代理采购协议号有误！");
                             }
                         }
 
                     }
 
-                    if ("代理-主业进口".equals(entity.getServiceType())||"其他/混合分型".equals(entity.getServiceType())) {
+                    if ("代理-主业进口".equals(entity.getServiceType()) || "其他/混合分型".equals(entity.getServiceType())) {
                         if (!StringUtils.isEmpty(entity.getAgentNo())) {
                             List<CustCtrl> agentNoSoList = custCtrlMapper.selectByAgentNoSo(entity.getAgentNoSo());
-                            if(agentNoSoList==null||agentNoSoList.isEmpty()){
+                            if (agentNoSoList == null || agentNoSoList.isEmpty()) {
                                 errors.add("代理销售协议号 有误！");
                             }
                         }
 
                     }
 
-                    if ("钢产品".equals(entity.getBizProductType())||"设备备件".equals(entity.getBizProductType())) {
+                    if ("钢产品".equals(entity.getBizProductType()) || "设备备件".equals(entity.getBizProductType())) {
                         if (!StringUtils.isEmpty(entity.getCommContrNo())) {
                             List<CustCtrl> commContrNoSoList = custCtrlMapper.selectCommContrNo(entity.getCommContrNo());
-                            if(commContrNoSoList==null||commContrNoSoList.isEmpty()){
+                            if (commContrNoSoList == null || commContrNoSoList.isEmpty()) {
                                 errors.add("佣金合同号 有误！");
                             }
                         }
@@ -324,7 +328,7 @@ public class SalesContractServiceImpl implements SalesContractService {
                     if ("铁矿石".equals(entity.getBizProductType())) {
                         if (!StringUtils.isEmpty(entity.getSettIndex())) {
                             List<DataDic> settIndexList = dicMapper.selectBySettIndex(entity.getSettIndex());
-                            if(settIndexList==null||settIndexList.isEmpty()){
+                            if (settIndexList == null || settIndexList.isEmpty()) {
                                 errors.add("结算指标在数据字典中不存在！");
                             }
                         }
@@ -333,8 +337,8 @@ public class SalesContractServiceImpl implements SalesContractService {
 
 
                     salesContractMapper.insert(entity);
-                    contractId = entity.getId();
-                    if (contractId == null) {
+                    Id = entity.getId();
+                    if (Id == null) {
                         errors.add("主表ID生成失败（contractId 为 null）！");
                     }
                 }
@@ -344,7 +348,7 @@ public class SalesContractServiceImpl implements SalesContractService {
 
 
             // 如果主表ID 都没生成，后面也插不了，但不能中断，要继续执行
-            final Long cid = contractId;
+            final Long cid = Id;
 
 
             // =================  产品明细 =================
@@ -354,6 +358,135 @@ public class SalesContractServiceImpl implements SalesContractService {
                     SalesDtlExcelDTO dto = list.size() >= 3 ? list.get(2) : list.get(0);
                     SalesDtlEntity entity = new SalesDtlEntity();
                     BeanUtils.copyProperties(dto, entity);
+                    //销售合同产品明细校验
+                    if (StringUtils.isEmpty(entity.getFno())) {
+                        errors.add("销售合同号不能为空！ ");
+                    }
+                    if (StringUtils.isEmpty(entity.getItemno())) {
+                        errors.add("商品编号不能为空！");
+                    }
+                    if (Objects.isNull(entity.getInTaxRate())) {
+                        errors.add("增值税率不能为空");
+
+                    }
+                    if (StringUtils.isEmpty(entity.getUt())) {
+                        errors.add("单位不能为空");
+                    }
+                    if (StringUtils.isEmpty(entity.getSdesc())) {
+                        errors.add("中文品名不能为空");
+                    }
+
+
+                    List<CustCtrl> itemnoList = custCtrlMapper.selectByItemno(entity.getItemno(), bizProductType);
+                    if (itemnoList == null || itemnoList.isEmpty()) {
+                        errors.add("商品编号有误！");
+                    }
+
+                    if (itemnoList != null && Objects.isNull(itemnoList.get(0).getInTaxRate())) {
+                        errors.add("匹配到的增值税率为空！");
+                    }
+
+                    if (itemnoList != null && !Objects.isNull(itemnoList.get(0).getInTaxRate())) {
+                        if (!Objects.equals(entity.getInTaxRate(), itemnoList.get(0).getInTaxRate())) {
+                            errors.add("输入的增值税率与匹配增值税率不一致！");
+                        }
+                    }
+
+                    if (itemnoList != null && !Objects.isNull(itemnoList.get(0).getReTaxRate())) {
+                        entity.setReTaxRate(itemnoList.get(0).getReTaxRate());
+                    }
+
+                    if (itemnoList != null && itemnoList.get(0).getUt().isEmpty()) {
+                        errors.add("匹配到的单位为空！");
+                    }
+
+                    if (itemnoList != null && !itemnoList.get(0).getUt().isEmpty()) {
+                        if (!entity.getUt().equals(itemnoList.get(0).getUt())) {
+                            errors.add("输入的单位与匹配单位不一致！");
+                        }
+                    }
+
+                    if (itemnoList != null && itemnoList.get(0).getSdesc().isEmpty()) {
+                        errors.add("匹配到的中文品名为空！");
+                    }
+
+                    if (itemnoList != null && !itemnoList.get(0).getSdesc().isEmpty()) {
+                        if (!entity.getSdesc().equals(itemnoList.get(0).getSdesc())) {
+                            errors.add("输入的中文品名与匹配到的中文品名不一致！");
+                        }
+                    }
+
+                    if (itemnoList != null && !itemnoList.get(0).getEdesc().isEmpty()) {
+                        entity.setEdesc(itemnoList.get(0).getEdesc());
+                    }
+
+                    if (itemnoList != null && !itemnoList.get(0).getHsCode().isEmpty()) {
+                        entity.setHsCode(itemnoList.get(0).getHsCode());
+                    }
+                    if (itemnoList != null && !itemnoList.get(0).getHsNameCn().isEmpty()) {
+                        entity.setHsNameCn(itemnoList.get(0).getHsNameCn());
+                    }
+                    if (itemnoList != null && !itemnoList.get(0).getHsNameEn().isEmpty()) {
+                        entity.setHsNameEn(itemnoList.get(0).getHsNameEn());
+                    }
+
+                    if (StringUtils.isEmpty(entity.getCurcyPo())) {
+                        errors.add("采购币种不能为空！");
+                    }
+
+                    List<CustCtrl> curcyList = custCtrlMapper.selectByCurcyPo(entity.getCurcyPo());
+                    if(curcyList ==null||curcyList.isEmpty()){
+                        errors.add("采购币种有误！");
+                    }
+
+                    if(curcyList !=null&&!curcyList.isEmpty()&&!Objects.isNull(curcyList.get(0).getRate())&&!Objects.isNull(entity.getRatePo())){
+                        if(Objects.equals(entity.getRatePo(), curcyList.get(0).getRate())){
+                            errors.add("采购汇率和匹配到的采购汇率不符!");
+                        }
+                    }
+
+
+
+                    if("铁矿石".equals(bizProductType)){
+                        if(Objects.isNull(entity.getIronCont())){
+                            errors.add("合同产品类型为铁矿石时，含铁量%不能为空!");
+                        }
+                    }
+
+                    if("铁矿石".equals(bizProductType)||"煤炭".equals(bizProductType)){
+                        if(Objects.isNull(entity.getMoisture())){
+                            errors.add("合同产品类型为铁矿石或煤炭时，水分%不能为空!");
+                        }
+
+                        if(StringUtils.isEmpty(entity.getPriceMtd())){
+                            errors.add("合同产品类型为铁矿石或煤炭时，计价方式不能为空！");
+                        }
+
+                        List<DataDic> priceMtdList =   dicMapper.selectByPriceMtd(entity.getPriceMtd());
+                        if(priceMtdList==null || priceMtdList.isEmpty()){
+                            errors.add("输入的计价方式在数据字典中不存在！");
+                        }
+                        if(!StringUtils.isEmpty(entity.getResourceNo())){
+                           List<CustCtrl> resourceNoList =  custCtrlMapper.selectByResourceNo(entity.getResourceNo(),bizProductType);
+                           if(resourceNoList==null || resourceNoList.isEmpty()){
+                               errors.add("资源号有误！");
+                           }
+                        }
+
+                    }
+
+                    if(Objects.isNull(entity.getPoprice())){
+                        errors.add("采购单价不能为空!");
+                    }
+                    if(Objects.isNull(entity.getQty())){
+                        errors.add("数量不能为空!");
+                    }
+
+
+
+
+
+
 
                     salesDtlMapper.insert(entity);
                 }

src/main/resources/mapper/CustCtrlMapper.xml

@@ -54,4 +54,53 @@
         )
         order by a.fdate desc
     </select>
+    <select id="selectByItemno" resultType="com.example.backend.entity.common.CustCtrl">
+        select b.type_name2,
+        a.itemno,
+        a.sdesc,
+        a.edesc,
+        a.ut,
+        a.hsCode,
+        a.hsNameCn,
+        a.hsNameEn,
+        a.inTaxRate
+        from SGGMIIP.invitem a
+        left join (select fno, type_name type_name2
+        from SGGMIIP.product_category
+        where nvl(del_flag, 0) != 1
+        and level = 0
+        and parent_id = 0) b on SUBSTR(a.itemno, 1, 2) = b.fno
+        where ifnull(a.del_flag, 0) != 1
+        and b.type_name2 = #{bizProductType}
+        and a.itemno = #{itemno}
+    </select>
+    <select id="selectByCurcyPo" resultType="com.example.backend.entity.common.CustCtrl">
+        select a.id
+             , a.fname
+             , a.fname1
+             , (select rate
+                from SGGMIIP.curcydtl
+                where a.id = rid
+                  and targetcode = 'CNY'
+                  and del_flag != 1) as rate
+             , (select rate
+                from SGGMIIP.curcydtl
+                where a.id = rid
+                  and targetcode = 'USD'
+                  and del_flag != 1) as rateUsd
+        from SGGMIIP.curcyctrl A
+        where ifnull(a.del_flag, 0) != 1
+          and ifnull(a.placed, '') = '2'
+          and a.fname = #{curcyPo}
+        group by a.id, a.fname, a.fname1
+    </select>
+    <select id="selectByResourceNo" resultType="com.example.backend.entity.common.CustCtrl">
+        select a.fno
+        from SGGMIIP.resourcectrl a
+        where ifnull(a.del_flag, 0) != 1
+        and ifnull(a.placed, '')='2'
+        and typename=#{bizProductType}
+        and a.fno =#{resourceNo}
+        order by a.fdate desc,a.fno
+    </select>
 </mapper>

src/main/resources/mapper/DicMapper.xml

@@ -39,4 +39,13 @@
           and i.status = '0'
           and d.status = '0'
     </select>
+    <select id="selectByPriceMtd" resultType="com.example.backend.entity.common.DataDic">
+        select d.dic_name, i.item_value
+        from SGGMIIP.data_dic d
+                 left join SGGMIIP.data_item i on d.id = i.dic_id
+        where i.item_value = #{priceMtd}
+          and d.dic_name = '计价方式'
+          and i.status = '0'
+          and d.status = '0'
+    </select>
 </mapper>