修改BUG

src/main/java/com/example/backend/pAndSExe/mapper/GongyingshangMapper.java

@@ -0,0 +1,70 @@
+package com.example.backend.pAndSExe.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.backend.pAndSExe.model.Gongyingshang;
+import org.apache.ibatis.annotations.Select;
+
+public interface GongyingshangMapper  extends BaseMapper<Gongyingshang> {
+
+    @Select("select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,\n" +
+            "        case\n" +
+            "        when IFNULL(ctAbbr, '') = '' then IFNULL(ctEnAbbr, '')\n" +
+            "        else IFNULL(ctAbbr, '')\n" +
+            "        end as cpal\n" +
+            "        , case\n" +
+            "        when IFNULL(ctCnNm, '') = '' then IFNULL(ctEnNm, '')\n" +
+            "        else IFNULL(ctCnNm, '')\n" +
+            "        end as cpny\n" +
+            "        , case\n" +
+            "        when IFNULL(ctCnAddr, '') = '' then IFNULL(ctEnAddr, '')\n" +
+            "        else IFNULL(ctCnAddr, '')\n" +
+            "        end as addr, a.ctrylmbAddr, estabDt, ctLevel, a.tel\n" +
+            "        , a.email,\n" +
+            "        case when nvl(b.bankNm,'')='' then '' else  nvl(b.bankNm,'')  end  as ctBankName,\n" +
+            "        case when nvl(b.bankAcct,'')='' then '' else  nvl(b.bankAcct,'')  end  as ctBankAcct,\n" +
+            "        case when nvl(c.name,'')='' then '' else  nvl(c.name,'')  end  as ctContNm\n" +
+            "        from SGGMIIP.custctrl a\n" +
+            "        LEFT JOIN (\n" +
+            "        SELECT  rid , bankNm , bankAcct , ROW_NUMBER() OVER (PARTITION BY rid ORDER BY id) as row_num\n" +
+            "        FROM SGGMIIP.custbank   WHERE NVL(del_flag, 0) != 1\n" +
+            "        ) b ON a.id = b.rid AND b.row_num = 1\n" +
+            "        left join SGGMIIP.custattn c on a.id = c.rid\n" +
+            "        where ifnull(a.del_flag, 0) != 1\n" +
+            "        and INSTR(ctNature, '供应商') > 0\n" +
+            "        and nvl(ctStatus,'')='已准入'\n" +
+            "        and a.ctCnNm = #{ctName}\n" +
+            "        order by a.fno\n" +
+            "        limit 1")
+    Gongyingshang selectGongyingshangByName(String ctName);
+
+    @Select(" select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,\n" +
+            "        case\n" +
+            "        when IFNULL(ctAbbr, '') = '' then IFNULL(ctEnAbbr, '')\n" +
+            "        else IFNULL(ctAbbr, '')\n" +
+            "        end as cpal\n" +
+            "        , case\n" +
+            "        when IFNULL(ctCnNm, '') = '' then IFNULL(ctEnNm, '')\n" +
+            "        else IFNULL(ctCnNm, '')\n" +
+            "        end as cpny\n" +
+            "        , case\n" +
+            "        when IFNULL(ctCnAddr, '') = '' then IFNULL(ctEnAddr, '')\n" +
+            "        else IFNULL(ctCnAddr, '')\n" +
+            "        end as addr, a.ctrylmbAddr, estabDt, ctLevel, a.tel\n" +
+            "        , a.email,\n" +
+            "        case when nvl(b.bankNm,'')='' then '' else  nvl(b.bankNm,'')  end  as ctBankName,\n" +
+            "        case when nvl(b.bankAcct,'')='' then '' else  nvl(b.bankAcct,'')  end  as ctBankAcct,\n" +
+            "        case when nvl(c.name,'')='' then '' else  nvl(c.name,'')  end  as ctContNm\n" +
+            "        from SGGMIIP.custctrl a\n" +
+            "        LEFT JOIN (\n" +
+            "        SELECT  rid , bankNm , bankAcct , ROW_NUMBER() OVER (PARTITION BY rid ORDER BY id) as row_num\n" +
+            "        FROM SGGMIIP.custbank   WHERE NVL(del_flag, 0) != 1\n" +
+            "        ) b ON a.id = b.rid AND b.row_num = 1\n" +
+            "        left join SGGMIIP.custattn c on a.id = c.rid\n" +
+            "        where ifnull(a.del_flag, 0) != 1\n" +
+            "        and INSTR(ctNature, '供应商') > 0\n" +
+            "        and nvl(ctStatus,'')='已准入'\n" +
+            "        and a.fno=#{fno}\n" +
+            "        order by a.fno\n" +
+            "        limit 1")
+    Gongyingshang selectGongyingshangByFno(String fno);
+}

src/main/java/com/example/backend/pAndSExe/model/Gongyingshang.java

@@ -0,0 +1,44 @@
+package com.example.backend.pAndSExe.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class Gongyingshang {
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+    @TableField("fno")
+    private String fno;
+    @TableField("rptg")
+    private String rptg;
+    @TableField("ctCnNm")
+    private String ctCnNm;
+    @TableField("ctEnNm")
+    private String ctEnNm;
+    @TableField("cpal")
+    private String cpal;
+    @TableField("cpny")
+    private String cpny;
+    @TableField("addr")
+    private String addr;
+    @TableField("ctrylmbAddr")
+    private String ctrylmbAddr;
+    @TableField("estabDt")
+    private Date estabDt;
+    @TableField("ctLevel")
+    private String ctLevel;
+    @TableField("tel")
+    private String tel;
+    @TableField("email")
+    private String email;
+    @TableField("ctBankName")
+    private String ctBankName;
+    @TableField("ctBankAcct")
+    private String ctBankAcct;
+    @TableField("ctContNm")
+    private String ctContNm;
+}

src/main/java/com/example/backend/pAndSExe/service/impl/StockServiceImpl.java

@@ -36,6 +36,9 @@ public class StockServiceImpl implements StockService {
     @Autowired
     private SOrderDtlMapper sOrderDtlMapper;
 
+    @Autowired
+    private SalesContractExeMapper salesContractExeMapper;
+
 
     /**
      * 批量导入inf_exe1数据到业务表（事务控制，保证主从表一致性）
@@ -84,6 +87,7 @@ public class StockServiceImpl implements StockService {
                 Purchasecontract purchasecontract =new Purchasecontract();
                 PurchaseOrder purchaseOrder =new PurchaseOrder();
                 SalesOrder salesOrder =new SalesOrder();
+                SalesContract salesContract=new SalesContract();
 
 
 
@@ -105,6 +109,7 @@ public class StockServiceImpl implements StockService {
                     }
                 }else if (exe1.getFmodalid()==24){
                      salesOrder = salesorderMapper.selectBySalesContract(exe1.getSfno());
+                    salesContract = salesContractExeMapper.selectByFno(exe1.getSfno());
                     if (salesOrder!=null) {
                         ctrl.setFours(salesOrder.getFours());
                         ctrl.setFoursname(salesOrder.getFoursname());
@@ -199,6 +204,7 @@ public class StockServiceImpl implements StockService {
                     }
                 }else if (exe1.getFmodalid()==24){
                     String id =mdkcctrlMapper.selectBySno(exe1.getSfno());
+                    salesContract = salesContractExeMapper.selectByFno(exe1.getSfno());
                     if (id!=null) {
                         SOrderDtl sOrderDtl=sOrderDtlMapper.selectBySalesContractId(id);
                         if (sOrderDtl!=null){
@@ -215,6 +221,8 @@ public class StockServiceImpl implements StockService {
                                 dtl.setAcctSet(salesOrder.getAcctSet());
 
                             }
+                            dtl.setSoOrderNo(salesContract.getFno());
+
                             Long soid=salesorderMapper.selectSoidById(id);
                             dtl.setSoid(soid);
                         }

src/main/java/com/example/backend/pAndSExe/util/PsExeExcelUtil.java

@@ -4,7 +4,10 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.alibaba.excel.exception.ExcelDataConvertException;
+import com.example.backend.entity.common.SysUser;
+import com.example.backend.mapper.contract.SysUserMapper;
 import com.example.backend.pAndSExe.dto.*;
+import com.example.backend.pAndSExe.mapper.GongyingshangMapper;
 import com.example.backend.pAndSExe.mapper.InfExe1AmountMapper;
 import com.example.backend.pAndSExe.mapper.InfExe1Mapper;
 import com.example.backend.pAndSExe.mapper.ShangpinkuMapper;
@@ -45,6 +48,9 @@ public class PsExeExcelUtil {
     @Autowired
     private ShangpinkuMapper shangpinkuMapper;
 
+    @Autowired
+    private GongyingshangMapper gongyingshangMapper;
+
 
     // 日期格式化器
     private   final String[] DATE_FORMATS = {"yyyy-MM-dd", "yyyy.MM.dd", "yyyy/MM/dd"};
@@ -607,14 +613,20 @@ public class PsExeExcelUtil {
         if (dto.getCombinedPaymentInfo() == null || dto.getCombinedPaymentInfo().trim().isEmpty()) {
             errorLogList.add("收款/受益人名称+银行名称+银行账号为空");
         }else {
-            if (dto.getCombinedPaymentInfo().contains(",")||dto.getCombinedPaymentInfo().contains("，")) {
-                String[] strings = splitCombinedField(dto.getCombinedPaymentInfo());
-                if ("无".equals(strings[1]) || "无".equals(strings[2])) {
+            String[] strings = splitCombinedField(dto.getCombinedPaymentInfo());
+            if (strings.length<3) {
+                errorLogList.add("收款人名称+收款人银行+银行账号格式不正确");
+            }else {
+                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(strings[0]);
+                if (gongyingshang == null) {
+                    errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
+                }
+                else if ("无".equals(strings[1]) || "无".equals(strings[2]) || "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
                     errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
                 }
-            }else {
-                errorLogList.add("收款/受益人信息格式错误，请按照收款/受益人名称+银行名称+银行账号格式填写，不可缺少");
             }
+
+
         }
 
         // 付款类型：非空校验
@@ -732,9 +744,19 @@ public class PsExeExcelUtil {
         }
         else {
             String[] strings = splitCombinedField(dto.getCombinedSuppInfo());
-            if("无".equals(strings[1])||"无".equals(strings[2])){
-                errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+            if (strings.length<3) {
+                errorLogList.add("收款人名称+收款人银行+银行账号格式不正确");
+            }else {
+                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(strings[0]);
+                if (gongyingshang == null) {
+                    errorLogList.add("供应商名称没有审批通过,需要先申请供应商; ");
+                }
+                else if ("无".equals(strings[1]) || "无".equals(strings[2]) || "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
+                    errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                }
             }
+
+
         }
 
         // 付款方式：非空校验（和Exe3一致）
@@ -1148,8 +1170,6 @@ public class PsExeExcelUtil {
         // 金额：非空 + 正数校验
         if (dto.getAmount() == null) {
             errorLogList.add("金额为空");
-        } else if (dto.getAmount() <= 0) {
-            errorLogList.add("金额必须大于0，当前值：" + dto.getAmount());
         }
 
         // 3. 构建错误日志
@@ -1232,25 +1252,36 @@ public class PsExeExcelUtil {
         } else {
             // 拆分规则：按第一个空格/逗号拆分，左侧为编号，右侧为名称
 
-            String[] ctArr = ctNoCtName.split("[,\\s]+", 2);
+            String[] ctArr = ctNoCtName.split("[-,\\s]+");
+
+            if (ctArr.length<2) {
+                errorLogList.add("客户编号+客户名称格式不正确");
+            }else {
+                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByFno(ctArr[0].trim());
+                if (gongyingshang == null) {
+                    errorLogList.add("供应商没有,需要先申请供应商; ");
+                }
+                else if (!ctArr[1].trim().equals(gongyingshang.getCtCnNm())) {
+                    errorLogList.add("客商编码和客商名称不匹配");
+                }
+            }
             if (ctArr.length >= 1) {
                 ctNo = ctArr[0];
                 ctName = ctArr.length == 2 ? ctArr[1] : "";
             }
-            if (ctNo.isEmpty()) {
-                errorLogList.add("客户编号解析失败，原始值：" + ctNoCtName);
-            }
         }
 
+
+
         // 认领金额：非空 + 正数校验
         BigDecimal claimedAmt = BigDecimal.ZERO;
         if (dto.getClaimedAmt() == null) {
             errorLogList.add("认领金额为空");
         } else {
             claimedAmt = BigDecimal.valueOf(dto.getClaimedAmt()).setScale(6, BigDecimal.ROUND_HALF_UP);
-            if (claimedAmt.compareTo(BigDecimal.ZERO) <= 0) {
+            /*if (claimedAmt.compareTo(BigDecimal.ZERO) <= 0) {
                 errorLogList.add("认领金额必须大于0，当前值：" + dto.getClaimedAmt());
-            }
+            }*/
         }
 
         // 币别：非空校验
@@ -1419,9 +1450,9 @@ public class PsExeExcelUtil {
             errorLogList.add("数量为空");
         } else {
             qty = BigDecimal.valueOf(dto.getQty()).setScale(6, BigDecimal.ROUND_HALF_UP);
-            if (qty.compareTo(BigDecimal.ZERO) <= 0) {
+           /* if (qty.compareTo(BigDecimal.ZERO) <= 0) {
                 errorLogList.add("数量必须大于0，当前值：" + dto.getQty());
-            }
+            }*/
         }
 
         // -------------------- 金额校验（非空+正数） --------------------
@@ -1430,9 +1461,9 @@ public class PsExeExcelUtil {
             errorLogList.add("含税金额为空");
         } else {
             soamt = BigDecimal.valueOf(dto.getSoamt()).setScale(6, BigDecimal.ROUND_HALF_UP);
-            if (soamt.compareTo(BigDecimal.ZERO) <= 0) {
+            /*if (soamt.compareTo(BigDecimal.ZERO) <= 0) {
                 errorLogList.add("金额必须大于0，当前值：" + dto.getSoamt());
-            }
+            }*/
         }
 
         BigDecimal ntSoAmt = BigDecimal.ZERO;
@@ -1440,9 +1471,9 @@ public class PsExeExcelUtil {
             errorLogList.add("不含税金额为空");
         } else {
             ntSoAmt = BigDecimal.valueOf(dto.getNtSoAmt()).setScale(6, BigDecimal.ROUND_HALF_UP);
-            if (soamt.compareTo(BigDecimal.ZERO) <= 0) {
+            /*if (soamt.compareTo(BigDecimal.ZERO) <= 0) {
                 errorLogList.add("金额必须大于0，当前值：" + dto.getSoamt());
-            }
+            }*/
         }
 
         // -------------------- 销项税率校验（非空+0-100之间） --------------------
@@ -1713,18 +1744,18 @@ public class PsExeExcelUtil {
             errorLogList.add("金额为空");
         } else {
             soamt = BigDecimal.valueOf(dto.getSoamt()).setScale(6, BigDecimal.ROUND_HALF_UP);
-            if (soamt.compareTo(BigDecimal.ZERO) <= 0) {
+            /*if (soamt.compareTo(BigDecimal.ZERO) <= 0) {
                 errorLogList.add("金额必须大于0，当前值：" + dto.getSoamt());
-            }
+            }*/
         }
         BigDecimal ntSoAmt = BigDecimal.ZERO;
         if (dto.getNtSoAmt() == null) {
             errorLogList.add("不含税金额为空");
         } else {
             ntSoAmt = BigDecimal.valueOf(dto.getNtSoAmt()).setScale(6, BigDecimal.ROUND_HALF_UP);
-            if (soamt.compareTo(BigDecimal.ZERO) <= 0) {
+            /*if (soamt.compareTo(BigDecimal.ZERO) <= 0) {
                 errorLogList.add("金额必须大于0，当前值：" + dto.getSoamt());
-            }
+            }*/
         }
 
 

src/main/java/com/example/backend/pAndSExe/util/Shujvzidian.java

@@ -3,9 +3,12 @@ package com.example.backend.pAndSExe.util;
 public class Shujvzidian {
     public static String danwei ="湿吨干吨辆架套个头块张件支枝根条筒长吨卷副片组份幅双对棵株井米盘平方米面节千克克盆万个具百副百支百把百个百片刀疋公担扇百枝千只千块千盒千枝千个亿支亿个万套千张万张千伏安千瓦千瓦时千升英尺吨立方米短吨司马担司马斤斤磅担英担短担两市担盎司克拉市尺码英寸寸升毫升英加仑美加仑立方英尺数量单位立方尺税务登记证平方码平方英尺平方尺英制马力公制马力令箱批罐桶扎包箩打筐罗匹册本发枚捆袋粒盒合瓶千支万双万粒千粒千米千英尺厘米部层床顶把只樘盏艘座其它";
     public static String fapiaozhonglei="增值税专用发票增值税普通发票全电增值税普通发票全电增值税专用发票其他发票全电增值税专用发票其他发票海关增值税完税证明海关关税完税证明";
-
-
-
-
+    public static String jizhongfangshi="理重计算实重计算净重计算";
+    public static String jijiafangshi="干吨计算湿吨计算";
+    public static String yewuleibie="采购类销售类";
+    public static String fukuanleixing="预付款发货前预付款发货后发票后结算";
+    public static String fukuanfangshi="电汇（海外TT）手工网银（国内TT）直联网银LC新票据-电子银票新票据-电子商票新票据-电子银票背书新票据-电子商票背书抹帐通宝开具通宝背书收取通宝";
+    public static String feiyongmingcheng="装卸费库厂使用费仓储费港口费超期堆存费检验费理货费货代费代理费保险费运输费加工费开证费用境外开证打包费汇兑损益银行手续费利息费用海关税费其他税费海关关税";
+    public static String bibie="USDCNYEURJPYHKDSGD";
+    public static String kaizhengyinhangmingcheng="上海浦东发展银行股份有限公司新加坡分行东亚银行香港分行东亚银行（中国）有限公司东营银行济南高新科技支行中信银行济南天桥支行中信银行股份有限公司中信银行股份有限公司天桥支行中信银行股份有限公司新加坡分行中国农业银行股份有限公司新加坡分行中国农业银行股份有限公司济南历下支行中国农业银行香港分行中国工商银行亚洲有限公司中国工商银行股份有限公司新加坡分行中国建设银行股份有限公司中国建设银行股份有限公司日照分行中国建设银行股份有限公司青岛山东路支行中国民生银行股份有限公司中国邮政储蓄银行历下自贸区支行中国邮政储蓄银行股份有限公司中国银行股份有限公司中国银行股份有限公司新加坡分行中国银行股份有限公司日照岚山支行中国银行股份有限公司莱芜钢城支行中国银行股份有限公司青岛东海路支行中国银行香港有限公司交通银行股份有限公司交通银行股份有限公司青岛市北第三支行交通银行香港分行兴业银行股份有限公司兴业银行股份有限公司日照分行兴业银行股份有限公司青岛分行营业部兴业银行香港分行北京银行股份有限公司北京银行股份有限公司青岛分行华夏银行股份有限公司华夏银行股份有限公司青岛分行大华银行大华银行香港分行平安银行股份有限公司平安银行股份有限公司平安银行股份有限公司青岛分行广发银行股份有限公司恒丰银行股份有限公司日照分行新加坡华侨银行有限公司日照银行股份有限公司虎山支行日照银行股份有限公司青岛分行星展银行星展银行香港分行法兴银行香港分行法国兴业银行香港分行法国巴黎银行新加坡分行法国巴黎银行香港分行济宁银行股份有限公司日照分行浙商银行股份有限公司浙商银行股份有限公司青岛分行渣打银行香港分行渤海银行股份有限公司青岛分行潍坊银行股份有限公司青岛分行荷兰合作银行香港分行荷兰国际集团银行荷兰安智银行香港分行青岛农村商业银行市北支行青岛银行股份有限公司齐商银行股份有限公司齐鲁银行股份有限公司日照分行";
 }
-