Merge remote-tracking branch 'origin/master'

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.example.backend.entity.common.BaseModelPur;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -133,8 +134,8 @@ public class PurchaseContract extends BaseModelPur {
     @TableField("marginAmt")
     private BigDecimal marginAmt;
 
-    @TableField("estLoadDt")
-    private Date estLoadDt;
+    /*@TableField(value = "estLoadDt", jdbcType = JdbcType.DATE)
+    private Date estLoadDt;*/
 
     @TableField("estArrDt")
     private Date estArrDt;

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

@@ -74,7 +74,7 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         List<ContractErrorMsg> contractErrorMsgs = check_program(excel_main, excel_dtl, excel_pay, excel_RCecent);
 
         // 保存错误信息到数据库
-        saveErrorMessages(contractErrorMsgs);
+        //saveErrorMessages(contractErrorMsgs);
 
         // 第三步：保存通过校验的数据
         boolean saveSuccess = saveSuccesscontract(purchaseContracts, pCcontractDtls, pCcontractPayments, pCcontractRCenterDtls);
@@ -495,12 +495,13 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
             setErrorAndAddToList(contractError, errorMsg, errorMsgList);
 
             // 如果校验通过，将数据添加到存储列表
-            if (errorMsg.length() == 0) {
-                addValidatedData(mainItem, dtlByPono.get(currentPono),
-                        payByPono.get(currentPono), rcentByPono.get(currentPono),
-                        createuserByList ,ZhixingUserByList ,wofangNameList ,GongYingNameList ,
-                        curcyList ,lPortList ,dPortList );
-            }
+            addValidatedData(mainItem, dtlByPono.get(currentPono),
+                    payByPono.get(currentPono), rcentByPono.get(currentPono),
+                    createuserByList ,ZhixingUserByList ,wofangNameList ,GongYingNameList ,
+                    curcyList ,lPortList ,dPortList );
+//            if (errorMsg.length() == 0) {
+//
+//            }
         }
     }
 
@@ -532,20 +533,29 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         contract.setSignPlace(wofangNameList.get(0).getSignLoc());
 
         //根据查询到的“供应商信息”结果填入数据
-        contract.setSupCode(GongYingNameList.get(0).getFno());
-        contract.setSupName(GongYingNameList.get(0).getCpny());
-        contract.setSupBank(GongYingNameList.get(0).getCtBankName());
-        contract.setSupAcc(GongYingNameList.get(0).getCtBankAcct());
-        contract.setSupContact(GongYingNameList.get(0).getCtContNm());
-        contract.setTradeCntry(GongYingNameList.get(0).getCtrylmbAddr());
+        if(GongYingNameList != null && !GongYingNameList.isEmpty()){
+            contract.setSupCode(GongYingNameList.get(0).getFno());
+            contract.setSupName(GongYingNameList.get(0).getCpny());
+            contract.setSupBank(GongYingNameList.get(0).getCtBankName());
+            contract.setSupAcc(GongYingNameList.get(0).getCtBankAcct());
+            contract.setSupContact(GongYingNameList.get(0).getCtContNm());
+            contract.setTradeCntry(GongYingNameList.get(0).getCtrylmbAddr());
+        }
+
 
         //根据查询到的“币别”信息填入数据
-        contract.setCurcy(curcyList.get(0).getFname());
-        contract.setRate(curcyList.get(0).getRate());
-        contract.setRateUs(curcyList.get(0).getRateUs());
+        if(curcyList != null && !curcyList.isEmpty()){
+            contract.setCurcy(curcyList.get(0).getFname());
+            contract.setRate(curcyList.get(0).getRate());
+            contract.setRateUs(curcyList.get(0).getRateUs());
+        }
+
         //根据查询到的“执行人”信息填入数据
-        contract.setContrExecNm(ZhixingUserByList.get(0).getUserCode());
-        contract.setContrExecNm(ZhixingUserByList.get(0).getUserDesc());
+        if(ZhixingUserByList != null && !ZhixingUserByList.isEmpty()){
+            contract.setContrExecNm(ZhixingUserByList.get(0).getUserCode());
+            contract.setContrExecNm(ZhixingUserByList.get(0).getUserDesc());
+        }
+
 
         contract.setCreateBy(createuserByList.get(0).getUserCode());
         contract.setCreateByName(createuserByList.get(0).getUserDesc());
@@ -563,7 +573,12 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         contract.setContrEnd(calendar.getTime());
         contract.setCurcy(mainItem.getCurcy());
         contract.setFundOccupyFlg("否");
-        contract.setEstLoadDt(mainItem.getEstLoadDt());
+        /*if (mainItem.getEstLoadDt() != null ){
+            contract.setEstLoadDt(mainItem.getEstLoadDt());
+        }else {
+            contract.setEstLoadDt(new Date());
+        }*/
+
         contract.setContrExecCd(mainItem.getContrExecCd());
         contract.setWhetherChartering("否");
 
@@ -571,13 +586,19 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
         contract.setIfBatch("否");
         contract.setIfTransfer("否");
         //装港信息写入
-        contract.setLoadPort(lPortList.get(0).getPortName());
-        contract.setLportCtry(lPortList.get(0).getCountryCnNm());
-        contract.setLpno(lPortList.get(0).getFno());
+        if (lPortList != null && !lPortList.isEmpty() ) {
+            contract.setLoadPort(lPortList.get(0).getPortName());
+            contract.setLportCtry(lPortList.get(0).getCountryCnNm());
+            contract.setLpno(lPortList.get(0).getFno());
+        }
+
         //目的港写入
-        contract.setDestPort(dPortList.get(0).getPortName());
-        contract.setDPortCtry(dPortList.get(0).getCountryCnNm());
-        contract.setDpno(dPortList.get(0).getFno());
+        if (dPortList != null && !dPortList.isEmpty() ) {
+            contract.setDestPort(dPortList.get(0).getPortName());
+            contract.setDPortCtry(dPortList.get(0).getCountryCnNm());
+            contract.setDpno(dPortList.get(0).getFno());
+        }
+
 
         contract.setIfPayMultiple("否");
         contract.setTransMode(mainItem.getTranWay());
@@ -600,9 +621,12 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                 List<CustCtrl> itemnoList = custCtrlMapper.selectByItemno(dtlDto.getItemno(), mainItem.getBizProductType());
                 PCcontractDtl dtl = new PCcontractDtl();
                 dtl.setPono(mainItem.getPono());
-                dtl.setItemno(itemnoList.get(0).getItemno());
-                dtl.setSdesc(itemnoList.get(0).getSdesc());
-                dtl.setBrand(itemnoList.get(0).getBrand());
+                if (itemnoList != null && !itemnoList.isEmpty()){
+                    dtl.setItemno(itemnoList.get(0).getItemno());
+                    dtl.setSdesc(itemnoList.get(0).getSdesc());
+                    dtl.setBrand(itemnoList.get(0).getBrand());
+                }
+
                 dtl.setFtype3(dtlDto.getSpec());
                 dtl.setUt(dtlDto.getUt());
                 dtl.setQty(dtlDto.getQty());
@@ -725,6 +749,8 @@ public class PurchaseContractServiceImpl implements PurchaseContractService {
                                        List<PCcontractRCenterDtl> pCcontractRCenterDtls) {
         try {
             for (int i = 0; i < purchaseContracts.size(); i++) {
+
+
                 PurchaseContract mainContract = purchaseContracts.get(i);
 
                 // 保存主表