执行模块费用付款仓库 进项发票添加通用字段

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.example.backend.pAndSExe.model.Paystockdtl;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 货款付款子表Mapper
@@ -16,4 +17,16 @@ public interface PaystockdtlMapper extends BaseMapper<Paystockdtl> {
     int insertPaystockdtl(@Param("paystockdtl") Paystockdtl paystockdtl);
 
     void insertFeePaystockdtl(@Param("paystockdtl")Paystockdtl paystockdtl);
+
+    @Select("select feeCd\n" +
+            "from fytypedtl\n" +
+            "where ifnull(del_flag, 0) != 1\n" +
+            "and feeNm=#{feeNm} limit 1")
+    String selectFeeCdByFeeNm(String feeNm);
+
+    @Select("select allocationCategory\n" +
+            "from fytypedtl\n" +
+            "where ifnull(del_flag, 0) != 1\n" +
+            "and feeNm=#{feeNm} limit 1")
+    String selectAllocationCategoryByFeeNm(String feeNm);
 }

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

@@ -119,9 +119,18 @@ public class FeePayServiceImpl implements FeePayService {
                 dtl.setRid(ctrlId);            // 关联主表ID（和Exe3一致）
                 dtl.setAppAmt(fee.getAppAmt());// 对应inf_feiyongfukuan.appAmt（申请金额）
                 dtl.setFeeNm(fee.getFeeNm());  // 对应inf_feiyongfukuan.feeNm（费用名称）
+                dtl.setPono(fee.getPono());    // 对应inf_feiyongfukuan.pono（合同编号）
+                dtl.setSono(fee.getSono());
+                dtl.setFno(fee.getFno());
+                dtl.setPlaced("2");
+                String feeCd=paystockdtlMapper.selectFeeCdByFeeNm(fee.getFeeNm());
+                dtl.setFeeCd(feeCd);
+                String allocationCategory= paystockdtlMapper.selectAllocationCategoryByFeeNm(fee.getFeeNm());
+                dtl.setAllocationCategory(allocationCategory);
+                dtl.setOtasno(fee.getOtasno());
 
                 // 插入子表（复用PaystockdtlMapper，需先更新XML补充feeNm字段）
-                paystockdtlMapper.insertFeePaystockdtl(dtl);
+                paystockdtlMapper.insert(dtl);
 
                 successCount++;
             } catch (Exception e) {

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

@@ -35,6 +35,9 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
     @Autowired
     private PurchasecontractMapper purchasecontractMapper;
 
+    @Autowired
+    private POrderDtlMapper pOrderDtlMapper;
+
     /**
      * 批量导入进项发票中间表数据到业务表
      */
@@ -76,6 +79,7 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
                 settle.setCreateByName(s);
                 settle.setCreateTime(new Date());
                 settle.setUpdateTime(new Date());
+                settle.setPlaced("2");
                 if (purchasecontract.getBiztype().equals("内贸采购")) {
                     settle.setFmodalid(13L);
 
@@ -182,8 +186,32 @@ public class JinxiangInvoiceSettleServiceImpl implements JinxiangInvoiceSettleSe
                 dtl.setPono(purchasecontract.getFno());
                 dtl.setPoOrderNo(purchasecontract.getFno());
 
+                POrderDtl pOrderDtl = pOrderDtlMapper.selectByPurchaseContractId(purchasecontract.getId());
+
+
+
                 if (purchasecontract.getBiztype().equals("内贸采购")) {
-                    List<Mdkcctrl> mdkcctrlList=mdkcctrlMapper.selectByPono(purchasecontract.getFno());
+                    dtl.setTaxInvNo(inf.getTaxInvNo()); // 映射中间表发票号
+                    dtl.setSoid(pOrderDtl.getSoid());
+                    dtl.setBizType(purchaseOrder.getBizType());
+                    dtl.setBizProductType(purchaseOrder.getBizProductType());
+                }else {
+                    dtl.setEdesc(pOrderDtl.getEdesc());
+                    dtl.setMoisture(pOrderDtl.getMoisture());
+                    dtl.setHsCode(pOrderDtl.getHsCode());
+                    dtl.setHsNameCn(pOrderDtl.getHsNameCn());
+                    dtl.setHsNameEn(pOrderDtl.getHsNameEn());
+                    dtl.setDutyRate(pOrderDtl.getDutyRate());
+                    dtl.setReTaxRate(pOrderDtl.getReTaxRate());
+                    dtl.setOutTaxRate(pOrderDtl.getOutTaxRate());
+                    dtl.setPriceMtd(pOrderDtl.getPriceMtd());
+                    dtl.setIronCont(pOrderDtl.getIronCont());
+                    dtl.setRatepo(pOrderDtl.getRatepo());
+                    dtl.setRateusdpo(pOrderDtl.getRateusdpo());
+                    dtl.setCnypoamt(pOrderDtl.getCnypoamt());
+                    dtl.setUsdpoamt(pOrderDtl.getUsdpoamt());
+                    dtl.setAcctSet(pOrderDtl.getAcctSet());
+                    dtl.setPoid(pOrderDtl.getPoid());
                 }
 
 

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

@@ -74,6 +74,7 @@ public class StockServiceImpl implements StockService {
                 ctrl.setFmodalid(exe1.getFmodalid());// 对应inf_exe1.fmodalid
                 ctrl.setCreateBy(exe1.getCreateBy());
                 ctrl.setQiChu("1");
+                ctrl.setPlaced("2");
                 String userName = mdkcctrlMapper.selectCreateByName(ctrl.getCreateBy());
                 if (userName!= null) {
                     ctrl.setCreateByName(userName);

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

@@ -252,16 +252,16 @@ public class PsExeExcelUtil {
             if (s.contains("-")) {
 
                 String[] split = s.split("-");
-                String muban="岚山港岚桥港日照港连云港港天津港曹妃甸港青岛港董家口港烟台港龙口港黄岛港鲅鱼圈港鲁中库济钢金属库智慧库春熙库德汇库中瑞库石禾库广盈库明晋库阳森库";
+                /*String muban="岚山港岚桥港日照港连云港港天津港曹妃甸港青岛港董家口港烟台港龙口港黄岛港鲅鱼圈港鲁中库济钢金属库智慧库春熙库德汇库中瑞库石禾库广盈库明晋库阳森库";
                 if(!muban.contains(split[1])){
                     errorLogList.add("仓库名称不正确,不在模板中");
-                }
+                }*/
             }else
             {
-                String muban="岚山港岚桥港日照港连云港港天津港曹妃甸港青岛港董家口港烟台港龙口港黄岛港鲅鱼圈港鲁中库济钢金属库智慧库春熙库德汇库中瑞库石禾库广盈库明晋库阳森库";
+                /*String muban="岚山港岚桥港日照港连云港港天津港曹妃甸港青岛港董家口港烟台港龙口港黄岛港鲅鱼圈港鲁中库济钢金属库智慧库春熙库德汇库中瑞库石禾库广盈库明晋库阳森库";
                 if(!muban.contains(s)){
                     errorLogList.add("仓库名称不正确,不在模板中");
-                }
+                }*/
             }
         }
 
@@ -273,7 +273,7 @@ public class PsExeExcelUtil {
         }
 
         else if (!Shujvzidian.danwei.contains(dto.getUt().trim())){
-            errorLogList.add("单位不在字典中");
+            errorLogList.add("单位不在下拉框中");
         }
         String bizProductType=infExe1Mapper.selectBizProductTypeByPfno(dto.getPfno());
         if (bizProductType == null || bizProductType.trim().isEmpty()) {
@@ -284,6 +284,8 @@ public class PsExeExcelUtil {
             }
             if (dto.getFtype4() == null || dto.getFtype4().trim().isEmpty()) {
                 errorLogList.add("钢产品计重方式为空");
+            }else if (!Shujvzidian.jizhongfangshi.contains(dto.getFtype4().trim())){
+                errorLogList.add("钢产品计重方式不在下拉框中");
             }
             /*if (dto.getSMRNo()==null || dto.getSMRNo().trim().isEmpty()) {
                 errorLogList.add("钢产品钢厂资源号为空");
@@ -297,6 +299,8 @@ public class PsExeExcelUtil {
             }
             if (dto.getPriceMtd() == null) {
                 errorLogList.add("铁矿石计价方式为空");
+            }else if (!Shujvzidian.jijiafangshi.contains(dto.getPriceMtd().trim())){
+                errorLogList.add("铁矿石计价方式不在下拉框中");
             }
         }else if (bizProductType.equals("煤炭")){
             if (dto.getMoisture() == null) {
@@ -304,6 +308,8 @@ public class PsExeExcelUtil {
             }
             if (dto.getPriceMtd() == null) {
                 errorLogList.add("煤炭计价方式为空");
+            }else if (!Shujvzidian.jijiafangshi.contains(dto.getPriceMtd().trim())){
+                errorLogList.add("煤炭计价方式不在下拉框中");
             }
         }
         if (dto.getPoprice()==null){
@@ -443,23 +449,23 @@ public class PsExeExcelUtil {
             if (s.contains("-")) {
 
                 String[] split = s.split("-");
-                String muban="岚山港岚桥港日照港连云港港天津港曹妃甸港青岛港董家口港烟台港龙口港黄岛港鲅鱼圈港鲁中库济钢金属库智慧库春熙库德汇库中瑞库石禾库广盈库明晋库阳森库";
+                /*String muban="岚山港岚桥港日照港连云港港天津港曹妃甸港青岛港董家口港烟台港龙口港黄岛港鲅鱼圈港鲁中库济钢金属库智慧库春熙库德汇库中瑞库石禾库广盈库明晋库阳森库";
                 if(!muban.contains(split[1])){
                     errorLogList.add("仓库名称不正确,不在模板中");
-                }
+                }*/
             }else
             {
-                String muban="岚山港岚桥港日照港连云港港天津港曹妃甸港青岛港董家口港烟台港龙口港黄岛港鲅鱼圈港鲁中库济钢金属库智慧库春熙库德汇库中瑞库石禾库广盈库明晋库阳森库";
+                /*String muban="岚山港岚桥港日照港连云港港天津港曹妃甸港青岛港董家口港烟台港龙口港黄岛港鲅鱼圈港鲁中库济钢金属库智慧库春熙库德汇库中瑞库石禾库广盈库明晋库阳森库";
                 if(!muban.contains(s)){
                     errorLogList.add("仓库名称不正确,不在模板中");
-                }
+                }*/
             }
         }
         if (dto.getUt() == null || dto.getUt().trim().isEmpty()) {
             errorLogList.add("单位为空");
         }
         else if (!Shujvzidian.danwei.contains(dto.getUt().trim())){
-            errorLogList.add("单位不在字典中");
+            errorLogList.add("单位不在下拉框中");
         }
         if (dto.getCreateBy() == null || dto.getCreateBy().trim().isEmpty()) {
             errorLogList.add("制单人为空");
@@ -473,6 +479,8 @@ public class PsExeExcelUtil {
             }
             if (dto.getFtype4() == null || dto.getFtype4().trim().isEmpty()) {
                 errorLogList.add("钢产品计重方式为空");
+            }else if (!Shujvzidian.jizhongfangshi.contains(dto.getFtype4().trim())){
+                errorLogList.add("钢产品计重方式不在下拉框中");
             }
             /*if (dto.getSMRNo()==null || dto.getSMRNo().trim().isEmpty()) {
                 errorLogList.add("钢产品钢厂资源号为空");
@@ -486,6 +494,8 @@ public class PsExeExcelUtil {
             }
             if (dto.getPriceMtd() == null) {
                 errorLogList.add("铁矿石计价方式为空");
+            }else if (!Shujvzidian.jijiafangshi.contains(dto.getPriceMtd().trim())){
+                errorLogList.add("铁矿石计价方式不在下拉框中");
             }
         }else if (bizProductType.equals("煤炭")){
             if (dto.getMoisture() == null) {
@@ -493,6 +503,8 @@ public class PsExeExcelUtil {
             }
             if (dto.getPriceMtd() == null) {
                 errorLogList.add("煤炭计价方式为空");
+            }else if (!Shujvzidian.jijiafangshi.contains(dto.getPriceMtd().trim())){
+                errorLogList.add("煤炭计价方式不在下拉框中");
             }
         }
         if (dto.getSoprice()==null){
@@ -629,14 +641,19 @@ public class PsExeExcelUtil {
 
         }
 
+
         // 付款类型：非空校验
         if (dto.getPayType() == null || dto.getPayType().trim().isEmpty()) {
             errorLogList.add("付款类型为空");
+        }else if (!Shujvzidian.fukuanleixing.contains(dto.getPayType().trim())){
+            errorLogList.add("付款类型不在下拉框中");
         }
 
         // 付款方式：非空校验
         if (dto.getPayment() == null || dto.getPayment().trim().isEmpty()) {
             errorLogList.add("付款方式为空");
+        }else if (!Shujvzidian.fukuanfangshi.contains(dto.getPayment().trim())){
+            errorLogList.add("付款方式不在下拉框中");
         }
 
         // 申请金额：非空校验（Double类型判断null）
@@ -647,6 +664,8 @@ public class PsExeExcelUtil {
         // 币别：非空校验
         if (dto.getCurcy() == null || dto.getCurcy().trim().isEmpty()) {
             errorLogList.add("币别为空");
+        }else if (!Shujvzidian.bibie.contains(dto.getCurcy().trim())){
+            errorLogList.add("币别不在下拉框中");
         }
         if (dto.getCreateBy() == null || dto.getCreateBy().trim().isEmpty()) {
             errorLogList.add("制单人为空");
@@ -713,6 +732,8 @@ public class PsExeExcelUtil {
         // 业务类别：非空校验
         if (dto.getExpNode() == null || dto.getExpNode().trim().isEmpty()) {
             errorLogList.add("业务类别为空");
+        }else if (!Shujvzidian.yewuleibie.contains(dto.getExpNode().trim())) {
+            errorLogList.add("业务类别不在下拉框中");
         }
 
         // 合同号规则：采购/销售/其他合同号至少一个非空；采购/销售合同号非空时校验存在性
@@ -762,6 +783,8 @@ public class PsExeExcelUtil {
         // 付款方式：非空校验（和Exe3一致）
         if (dto.getPayment() == null || dto.getPayment().trim().isEmpty()) {
             errorLogList.add("付款方式为空");
+        }else if (!Shujvzidian.fukuanfangshi.contains(dto.getPayment().trim())) {
+            errorLogList.add("付款方式不在下拉框中");
         }
         if (dto.getCreateBy() == null || dto.getPayment().trim().isEmpty()) {
             errorLogList.add("制单人为空");
@@ -770,6 +793,8 @@ public class PsExeExcelUtil {
         // 费用名称：非空校验（Exe4特有字段）
         if (dto.getFeeNm() == null || dto.getFeeNm().trim().isEmpty()) {
             errorLogList.add("费用名称为空");
+        }else if (!Shujvzidian.feiyongmingcheng.contains(dto.getFeeNm().trim())) {
+            errorLogList.add("费用名称不在下拉框中");
         }
 
         // 申请金额：非空校验（Double类型，和Exe3一致）
@@ -780,6 +805,8 @@ public class PsExeExcelUtil {
         // 币别：非空校验（和Exe3一致）
         if (dto.getCurcy() == null || dto.getCurcy().trim().isEmpty()) {
             errorLogList.add("币别为空");
+        }else if (!Shujvzidian.bibie.contains(dto.getCurcy().trim())) {
+            errorLogList.add("币别不在下拉框中");
         }
 
         // 3. 构建errorLog字符串（多错误用分号分隔，和Exe3/Sheet1一致）
@@ -876,6 +903,8 @@ public class PsExeExcelUtil {
         }
         if (dto.getExpNode() == null || dto.getExpNode().trim().isEmpty()) {
             errorLogList.add("业务类别为空");
+        }else if (!Shujvzidian.yewuleibie.contains(dto.getExpNode().trim())) {
+            errorLogList.add("业务类别不在下拉框中");
         }
         if (dto.getCateName() == null || dto.getCateName().trim().isEmpty()) {
             errorLogList.add("类别名称为空");
@@ -884,7 +913,7 @@ public class PsExeExcelUtil {
             errorLogList.add("单位为空");
         }
         else if (!Shujvzidian.danwei.contains(dto.getUt().trim())){
-            errorLogList.add("单位不在字典中");
+            errorLogList.add("单位不在下拉框中");
         }
         if (dto.getFeeNm() == null || dto.getFeeNm().trim().isEmpty()) {
             errorLogList.add("费用名称为空");
@@ -1032,7 +1061,7 @@ public class PsExeExcelUtil {
             errorLogList.add("单位为空");
         }
         else if (!Shujvzidian.danwei.contains(dto.getUt().trim())){
-            errorLogList.add("单位不在字典中");
+            errorLogList.add("单位不在下拉框中");
         }
         if (dto.getCurcypo() == null || dto.getCurcypo().trim().isEmpty()) {
             errorLogList.add("币别为空");
@@ -1433,7 +1462,7 @@ public class PsExeExcelUtil {
         if (ut.isEmpty()) {
             errorLogList.add("单位为空");
         }else if (!Shujvzidian.danwei.contains(ut)){
-            errorLogList.add("单位不在字典中");
+            errorLogList.add("单位不在下拉框中");
         }
 
 

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

@@ -5,7 +5,7 @@ public class Shujvzidian {
     public static String fapiaozhonglei="增值税专用发票增值税普通发票全电增值税普通发票全电增值税专用发票其他发票全电增值税专用发票其他发票海关增值税完税证明海关关税完税证明";
     public static String jizhongfangshi="理重计算实重计算净重计算";
     public static String jijiafangshi="干吨计算湿吨计算";
-    public static String yewuleibie="采购类销售类";
+    public static String yewuleibie="采购类销售类加工类";
     public static String fukuanleixing="预付款发货前预付款发货后发票后结算";
     public static String fukuanfangshi="电汇（海外TT）手工网银（国内TT）直联网银LC新票据-电子银票新票据-电子商票新票据-电子银票背书新票据-电子商票背书抹帐通宝开具通宝背书收取通宝";
     public static String feiyongmingcheng="装卸费库厂使用费仓储费港口费超期堆存费检验费理货费货代费代理费保险费运输费加工费开证费用境外开证打包费汇兑损益银行手续费利息费用海关税费其他税费海关关税";