1

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

@@ -278,7 +278,7 @@ public class SysUser {
     @TableField(exist = false)
     private String deptCode;
 
-
+    //
     @TableField(exist = false)
     private String cpny;
 

src/main/java/com/example/backend/entity/pccontract/PCcontractDtl.java

@@ -12,7 +12,7 @@ import java.util.List;
  * 合同交货明细从表
  */
 @Data
-@TableName("SGGMINFT.purchaseDtl")
+@TableName("SGGMIIP.purchaseDtl")
 public class PCcontractDtl extends BaseModelPur {
 
     private static final long serialVersionUID = 1L;
@@ -51,8 +51,8 @@ public class PCcontractDtl extends BaseModelPur {
     @TableField("dryTonQty")
     private BigDecimal dryTonQty;
 
-    @TableField("priceMode")
-    private String priceMode;
+    @TableField("priceMtd")
+    private String priceMtd;
 
     @TableField("qty")
     private BigDecimal qty;
@@ -119,8 +119,8 @@ public class PCcontractDtl extends BaseModelPur {
 
     @TableField("dept_id")
     private String deptId;
-    @TableField("fchno")
-    private int fchno;
+    //@TableField("fchno")
+    //private int fchno;
     @TableField(exist = false)
 
     private List<PCcontractDtl> purchaseDtls;

src/main/java/com/example/backend/entity/pccontract/PCcontractPayment.java

@@ -15,7 +15,7 @@ import java.util.Date;
  * 合同付款明细从表
  */
 @Data
-@TableName("SGGMINFT.purchasePayment")
+@TableName("SGGMIIP.purchasePayment")
 public class PCcontractPayment extends BaseModelPur {
 
     private static final long serialVersionUID = 1L;

src/main/java/com/example/backend/entity/pccontract/PCcontractRCenterDtl.java

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 @Data
-@TableName("SGGMINFT.rCenterDtl")
+@TableName("SGGMIIP.rCenterDtl")
 public class PCcontractRCenterDtl extends BaseModelPur {
 
     private static final long serialVersionUID = 1L;
@@ -29,6 +29,9 @@ public class PCcontractRCenterDtl extends BaseModelPur {
     @TableField("assessRatio")
     private BigDecimal assessRatio;
 
+    @TableField("assessQtyRate")
+    private BigDecimal assessQtyRate;
+
     @TableField("assessAmt")
     private BigDecimal assessAmt;
 

src/main/java/com/example/backend/entity/pccontract/PurchaseContract.java

@@ -16,7 +16,7 @@ import java.util.List;
  * 销售合同主表
  */
 @Data
-@TableName("SGGMINFT.purchaseContract")
+@TableName("SGGMIIP.purchaseContract")
 public class PurchaseContract extends BaseModelPur {
 
     private static final long serialVersionUID = 1L;
@@ -314,6 +314,9 @@ public class PurchaseContract extends BaseModelPur {
     @TableField("rateUsd")
     private BigDecimal rateUsd;
 
+    @TableField("rateUs")
+    private BigDecimal rateUs;
+
     @TableField("WhetherChartering")
     private String WhetherChartering;
 
@@ -346,4 +349,5 @@ public class PurchaseContract extends BaseModelPur {
 
     @TableField("fchno")
     private int fchno;
+
 }

src/main/java/com/example/backend/excel/PcContract/PcContractDtlDto.java

@@ -14,7 +14,7 @@ public class PcContractDtlDto {
     @ExcelProperty("批次号")
     private String batchNo;
 
-    @ExcelProperty("商品编号")
+    @ExcelProperty("商品编码")
     private String itemno;
 
     @ExcelProperty("规格描述")

src/main/java/com/example/backend/excel/PcContract/PcContractMainDto.java

@@ -40,16 +40,16 @@ public class PcContractMainDto {
     @ExcelProperty("数量短装%")
     private BigDecimal qtyShort;
 
-    @ExcelProperty("金额溢装%")
+    @ExcelProperty("金额溢装")
     private BigDecimal amtOver;
 
-    @ExcelProperty("金额短装%")
+    @ExcelProperty("金额短装")
     private BigDecimal amtShort;
 
     @ExcelProperty("币别")
     private String curcy;
 
-    @ExcelProperty("最迟装运日期")
+    @ExcelProperty("最迟装运时间")
     @DateTimeFormat("yyyy-MM-dd")
     private Date estLoadDt;
 

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

@@ -142,7 +142,7 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
      */
     private Map<String, List<PcContractDtlDto>> buildDtlMap(List<PcContractDtlDto> excel_dtl) {
         Map<String, List<PcContractDtlDto>> map = new HashMap<>();
-        if (excel_dtl != null) {
+        if (excel_dtl != null ) {
             for (PcContractDtlDto dtl : excel_dtl) {
                 if (dtl.getPono() != null && !dtl.getPono().trim().isEmpty()) {
                     map.computeIfAbsent(dtl.getPono(), k -> new ArrayList<>()).add(dtl);
@@ -265,11 +265,11 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                 String code = mainItem.getSupName().substring(mainItem.getSupName().indexOf("-") + 1);
                 mainItem.setSupName(code);
                 GongYingNameList = sysUserMapper.selectByGongYingName(code);
-                if (GongYingNameList != null && !GongYingNameList.isEmpty() && !"2".equals(GongYingNameList.get(0).getPlaced())) {
+                if (GongYingNameList == null ||  GongYingNameList.isEmpty() ) {
                     errorMsg.append("供应商名称没有审批通过; ");
                 }
                 if (GongYingNameList != null && !GongYingNameList.isEmpty() && GongYingNameList.get(0).getFno().isEmpty()) {
-                    errorMsg.append("供应商代买没有审批通过; ");
+                    errorMsg.append("供应商代码没有审批通过; ");
                 }
             }
             if (mainItem.getCurcy() == null || mainItem.getCurcy().trim().isEmpty()) {
@@ -311,11 +311,11 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                     (mainItem.getServiceType() != null && mainItem.getServiceType().contains("主业")))) &&
                     (mainItem.getLPort() == null || mainItem.getLPort().trim().isEmpty())) {
                 errorMsg.append("装运港不能为空; ");
-            }else if (mainItem.getLPort() == null && mainItem.getLPort().trim().isEmpty()){
+            }else if (mainItem.getLPort() != null && !mainItem.getLPort().trim().isEmpty()){
                 lPortList = custCtrlMapper.selectLPortByLportName(mainItem.getLPort());
                 if (lPortList == null || lPortList.isEmpty()) {
                     errorMsg.append("装运港信息有误; ");
-                } else if (lPortList != null && !lPortList.isEmpty() && (lPortList.get(0).getCountryName()== null || lPortList.get(0).getCountryName().isEmpty())) {
+                } else if (lPortList != null && !lPortList.isEmpty() && (lPortList.get(0).getCountryCnNm()== null || lPortList.get(0).getCountryCnNm().isEmpty())) {
                     errorMsg.append("装运港维护信息有误; ");
                 }
             }
@@ -325,11 +325,11 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                     (mainItem.getServiceType() != null && mainItem.getServiceType().contains("主业")))) &&
                     (mainItem.getDPort() == null || mainItem.getDPort().trim().isEmpty())) {
                 errorMsg.append("目的港不能为空; ");
-            }else if (mainItem.getDPort() == null && mainItem.getDPort().trim().isEmpty()){
+            }else if (mainItem.getDPort() != null && !mainItem.getDPort().trim().isEmpty()){
                 dPortList = custCtrlMapper.selectLPortByLportName(mainItem.getDPort());
                 if (dPortList == null || dPortList.isEmpty()) {
                     errorMsg.append("目的港信息有误; ");
-                } else if (dPortList != null && !dPortList.isEmpty() && (dPortList.get(0).getCountryName()== null || dPortList.get(0).getCountryName().isEmpty())) {
+                } else if (dPortList != null && !dPortList.isEmpty() && (dPortList.get(0).getCountryCnNm()== null || dPortList.get(0).getCountryCnNm().isEmpty())) {
                     errorMsg.append("目的港维护信息有误; ");
                 }
             }
@@ -434,13 +434,13 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                     if (pay.getPayType()  == null || pay.getPayType().trim().isEmpty()){
                         errorMsg.append("付款计划中款项类别不能为空; ");
                     } else if (pay.getPayType() != null && !pay.getPayType().trim().isEmpty()) {
-                        validateSingleDictField(mainItem.getTerms(), "合同计划-款项类型", "合同计划-款项类型", allDicts, errorMsg);
+                        validateSingleDictField(pay.getPayType(), "合同计划-款项类型", "合同计划-款项类型", allDicts, errorMsg);
                     }
 
                     if (pay.getPayMethod()  == null || pay.getPayMethod().trim().isEmpty()){
                         errorMsg.append("付款计划中付款方式不能为空; ");
                     } else if (pay.getPayMethod() != null && !pay.getPayMethod().trim().isEmpty()) {
-                        validateSingleDictField(mainItem.getTerms(), "合同计划-付款方式", "合同计划-付款方式", allDicts, errorMsg);
+                        validateSingleDictField(pay.getPayMethod(), "合同计划-付款方式", "合同计划-付款方式", allDicts, errorMsg);
                     }
 
                     if (pay.getPayDays()  == null || pay.getPayDays().toString().trim().isEmpty()){
@@ -522,8 +522,9 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         contract.setServiceType(mainItem.getServiceType());
         contract.setBizType(mainItem.getBizType());
         contract.setBizProductType(mainItem.getBizProductType());
+        contract.setPriceCls(mainItem.getTerms());
         //根据查询“我方信息”结果填入部分数据
-        contract.setFoursname(wofangNameList.get(0).getCountryName());
+        contract.setFoursname(wofangNameList.get(0).getCpny());
         contract.setFours(wofangNameList.get(0).getFno());
         contract.setOurBankNm(wofangNameList.get(0).getOurBankNm());
         contract.setOurBankAcct(wofangNameList.get(0).getOurBankAcct());
@@ -540,7 +541,7 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         //根据查询到的“币别”信息填入数据
         contract.setCurcy(curcyList.get(0).getFname());
         contract.setRate(curcyList.get(0).getRate());
-        contract.setRateUsd(curcyList.get(0).getRateUs());
+        contract.setRateUs(curcyList.get(0).getRateUs());
         //根据查询到的“执行人”信息填入数据
         contract.setContrExecNm(ZhixingUserByList.get(0).getUserCode());
         contract.setContrExecNm(ZhixingUserByList.get(0).getUserDesc());
@@ -585,6 +586,8 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         contract.setIfBidding("否");
 
         contract.setRemark("期初导入-采购");
+        contract.setFmodalid(8);
+        contract.setPlaced("0");
 
         purchaseContracts.add(contract);
 
@@ -598,11 +601,14 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                 dtl.setSdesc(itemnoList.get(0).getSdesc());
                 dtl.setBrand(itemnoList.get(0).getBrand());
                 dtl.setFtype3(dtlDto.getSpec());
-                dtl.setUt(dtl.getUt());
+                dtl.setUt(dtlDto.getUt());
                 dtl.setQty(dtlDto.getQty());
-                dtl.setPoPrice(dtl.getPoPrice());
-                dtl.setMoisture(dtl.getMoisture());
-                dtl.setPriceMode(dtl.getPriceMode());
+                dtl.setPoPrice(dtlDto.getPoprice());
+                dtl.setMoisture(dtlDto.getMoisture());
+                dtl.setPriceMtd(dtlDto.getPriceMtd());
+                dtl.setInputTaxRate(dtlDto.getInTaxRate());
+                dtl.setIronCont(dtlDto.getIronCont());
+                dtl.setPoAmt(dtlDto.getPoamt());
 
                 pCcontractDtls.add(dtl);
             }
@@ -617,8 +623,8 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                 payment.setPayType(payDto.getPayType());
                 payment.setPayMethod(payDto.getPayMethod());
                 payment.setPayRatio(payDto.getPayRatio());
-                payment.setPayAmt(payment.getPayAmt());
-                payment.setPayDays(payment.getPayDays());
+                payment.setPayAmt(String.valueOf(payDto.getPayAmt()));
+                payment.setPayDays(String.valueOf(payDto.getPayDays()));
                 pCcontractPayments.add(payment);
             }
         }
@@ -626,33 +632,35 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         // 转换责任中心数据
         if (rcentList != null) {
             for (PcContractRCentDto rcentDto : rcentList) {
-                PCcontractRCenterDtl rcent = convertToPCcontractRCenterDtl(rcentDto);
+                PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
+                rcent.setPono(mainItem.getPono());
+                rcent.setCreateBy(rcentDto.getCreate_by());
+                List<SysUser> createByList = sysUserMapper.selectByCreateBy(rcentDto.getCreate_by());
+                if (createByList != null && !createByList.isEmpty()) {
+                    rcent.setDeptId(createByList.get(0).getDeptCode());
+                    rcent.setDeptName(createByList.get(0).getDeptName());
+                    rcent.setCreateByName(createByList.get(0).getUserDesc());
+                }
+                rcent.setAssessQtyRate(rcentDto.getAssessQtyRate());
+                rcent.setAssessRatio(rcentDto.getAssessRatio());
                 pCcontractRCenterDtls.add(rcent);
             }
+        }else {
+            PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
+            rcent.setPono(mainItem.getPono());
+            rcent.setCreateBy(mainItem.getCreate_by());
+            List<SysUser> createByList = sysUserMapper.selectByCreateBy(mainItem.getCreate_by());
+            if (createByList != null && !createByList.isEmpty()) {
+                rcent.setDeptId(createByList.get(0).getDeptCode());
+                rcent.setDeptName(createByList.get(0).getDeptName());
+                rcent.setCreateByName(createByList.get(0).getUserDesc());
+            }
+            rcent.setAssessQtyRate(new BigDecimal(100));
+            rcent.setAssessRatio(new BigDecimal(100));
+            pCcontractRCenterDtls.add(rcent);
         }
     }
 
-
-    /**
-     * 转换付款计划数据
-     */
-    private PCcontractPayment convertToPCcontractPayment(PcContractPayDto dto) {
-        PCcontractPayment payment = new PCcontractPayment();
-
-
-        return payment;
-    }
-
-    /**
-     * 转换责任中心数据
-     */
-    private PCcontractRCenterDtl convertToPCcontractRCenterDtl(PcContractRCentDto dto) {
-        PCcontractRCenterDtl rcent = new PCcontractRCenterDtl();
-
-
-        return rcent;
-    }
-
     /**
      * 创建合同错误信息对象
      */
@@ -741,7 +749,7 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
     private void saveContractDetails(String mainId, List<PCcontractDtl> dtlList, String pono) {
         for (PCcontractDtl dtl : dtlList) {
             if (pono.equals(dtl.getPono())) {
-                dtl.setRid(mainId);
+                dtl.setRrid(mainId);
                 pCcontractDtlMapper.insert(dtl);
             }
         }

src/main/java/com/example/backend/util/PcExcelUtil.java

@@ -23,9 +23,9 @@ public class PcExcelUtil {
     public static List<PcContractMainDto> readPcMainExcelSync(MultipartFile file) {
         try (InputStream inputStream = file.getInputStream()) {
             return EasyExcel.read(inputStream)
-                    .head(PcContractPayDto.class)
+                    .head(PcContractMainDto.class)
                     .sheet("合同主表")
-                    .headRowNumber(4)
+                    .headRowNumber(1)
                     .doReadSync();
         } catch (IOException e) {
             System.out.println("读取Excel文件失败: " + e.getMessage());
@@ -40,9 +40,9 @@ public class PcExcelUtil {
     public static List<PcContractDtlDto> readPcDtlExcelSync(MultipartFile file) {
         try (InputStream inputStream = file.getInputStream()) {
             return EasyExcel.read(inputStream)
-                    .head(PcContractPayDto.class)
+                    .head(PcContractDtlDto.class)
                     .sheet("合同商品明细")
-                    .headRowNumber(3)
+                    .headRowNumber(1)
                     .doReadSync();
         } catch (IOException e) {
             System.out.println("读取Excel文件失败: " + e.getMessage());
@@ -59,7 +59,7 @@ public class PcExcelUtil {
             return EasyExcel.read(inputStream)
                     .head(PcContractPayDto.class)
                     .sheet("付款计划")
-                    .headRowNumber(3)
+                    .headRowNumber(1)
                     .doReadSync();
         } catch (IOException e) {
             System.out.println("读取Excel文件失败: " + e.getMessage());
@@ -74,9 +74,9 @@ public class PcExcelUtil {
     public static List<PcContractRCentDto> readPcRcentExcelSync(MultipartFile file) {
         try (InputStream inputStream = file.getInputStream()) {
             return EasyExcel.read(inputStream)
-                    .head(PcContractPayDto.class)
+                    .head(PcContractRCentDto.class)
                     .sheet("责任中心")
-                    .headRowNumber(3)
+                    .headRowNumber(1)
                     .doReadSync();
         } catch (IOException e) {
             System.out.println("读取Excel文件失败: " + e.getMessage());

src/main/resources/application.yml

@@ -11,8 +11,8 @@ spring:
       max-request-size: 10MB
   datasource:
     driver-class-name: dm.jdbc.driver.DmDriver
-    url: jdbc:dm://10.19.14.22:5236
-    username: SGGMINFT
+    url: jdbc:dm://10.19.13.211:5236
+    username: SGGMIIP
     password: SXxxjsgs2025
     druid:
       initial-size: 5

src/main/resources/mapper/SysUserMapper.xml

@@ -49,49 +49,37 @@
 
 
     <select id="selectByGongYingName" resultType="com.example.backend.entity.common.SysUser">
-        select a.id,
-               a.fno,
-               a.rptg,
-               a.ctCnNm,
-               a.ctEnNm,
-               case
-                   when IFNULL(ctAbbr, '') = '' then IFNULL(ctEnAbbr, '')
-                   else IFNULL(ctAbbr, '')
-                   end                                                                 as cpal
-                ,
-               case
-                   when IFNULL(ctCnNm, '') = '' then IFNULL(ctEnNm, '')
-                   else IFNULL(ctCnNm, '')
-                   end                                                                 as cpny
-                ,
-               case
-                   when IFNULL(ctCnAddr, '') = '' then IFNULL(ctEnAddr, '')
-                   else IFNULL(ctCnAddr, '')
-                   end                                                                 as addr,
-               a.ctrylmbAddr,
-               estabDt,
-               ctLevel,
-               a.tel
-                ,
-               a.email,
-               case when nvl(b.bankNm, '') = '' then '' else nvl(b.bankNm, '') end     as ctBankName,
-               case when nvl(b.bankAcct, '') = '' then '' else nvl(b.bankAcct, '') end as ctBankAcct,
-               case when nvl(c.name, '') = '' then '' else nvl(c.name, '') end         as ctContNm
-
-        from custctrl a
-                 LEFT JOIN (SELECT rid, bankNm, bankAcct, ROW_NUMBER() OVER (PARTITION BY rid ORDER BY id) as row_num
-                            FROM custbank
-                            WHERE NVL(del_flag, 0) != 1) b ON a.id = b.rid AND b.row_num = 1
-                 left join custattn c on a.id = c.rid
+        select a.id, a.fno,a.rptg,a.ctCnNm,a.ctEnNm,
+        case
+        when IFNULL(ctAbbr, '') = '' then IFNULL(ctEnAbbr, '')
+        else IFNULL(ctAbbr, '')
+        end as cpal
+        , case
+        when IFNULL(ctCnNm, '') = '' then IFNULL(ctEnNm, '')
+        else IFNULL(ctCnNm, '')
+        end as cpny
+        , case
+        when IFNULL(ctCnAddr, '') = '' then IFNULL(ctEnAddr, '')
+        else IFNULL(ctCnAddr, '')
+        end as addr, a.ctrylmbAddr, estabDt, ctLevel, a.tel
+        , a.email,
+        case when nvl(b.bankNm,'')='' then '' else  nvl(b.bankNm,'')  end  as ctBankName,
+        case when nvl(b.bankAcct,'')='' then '' else  nvl(b.bankAcct,'')  end  as ctBankAcct,
+        case when nvl(c.name,'')='' then '' else  nvl(c.name,'')  end  as ctContNm
+        from SGGMIIP.custctrl a
+        LEFT JOIN (
+        SELECT  rid , bankNm , bankAcct , ROW_NUMBER() OVER (PARTITION BY rid ORDER BY id) as row_num
+        FROM SGGMIIP.custbank   WHERE NVL(del_flag, 0) != 1
+        ) b ON a.id = b.rid AND b.row_num = 1
+        left join SGGMIIP.custattn c on a.id = c.rid
         where ifnull(a.del_flag, 0) != 1
-          and (checkPermission('客商管理', a) or a.rptg is null or a.rptg = '')
-          and INSTR(ctNature, '供应商') > 0
-          and nvl(ctStatus, '') = '已准入'
-          and a.ctCnNm = #{ctName}
+        and INSTR(ctNature, '供应商') > 0
+        and nvl(ctStatus,'')='已准入'
+        and a.ctCnNm = #{ctName}
         order by a.fno
     </select>
     <select id="selectByCreateBy" resultType="com.example.backend.entity.common.SysUser">
-        select a.id, a.dept_code as deptCode, a.DEPT_NAME, c.user_desc, c.USER_CODE
+        select a.id,a.dept_code as deptCode, a.DEPT_NAME,c.user_desc,c.USER_CODE
         from SGGMIIP.SYS_DEPARTMENT a
                  join SGGMIIP.SYS_USER_DEPARTMENT b on a.id = b.DEPT_ID
                  join SGGMIIP.SYS_USER c on b.USER_ID = c.id