修改大量

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

@@ -43,4 +43,12 @@ public interface MdkcctrlMapper extends BaseMapper<Mdkcctrl> {
 
     @Select("select * from SGGMIIP.mdkcctrl where pono =#{fno} where del_flag != '1' ")
     List<Mdkcctrl> selectByPono(String fno);
+
+    @Select("select stockno\n" +
+            "from warehouse\n" +
+            "where ifnull(del_flag, 0) <> 1\n" +
+            "\tand ifnull(endsign, 0) = 1\n" +
+            "and sotockname=#{stockname}\n" +
+            "limit 1")
+    String selectStockNoByName(String stockname);
 }

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

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Select;
 public interface PurchaseorderMapper extends BaseMapper <PurchaseOrder> {
 
 
-    @Select("select * from SGGMIIP.purchaseOrder WHERE pono=#{pono} ")
+    @Select("select * from SGGMIIP.purchaseOrder WHERE pono=#{pono} and del_flag!='1' limit 1 ")
     PurchaseOrder selectByPurchaseContract(String pono);
 
 

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

@@ -115,6 +115,13 @@ public class ShoukuanrenlingSettleServiceImpl implements ShoukuanrenlingSettleSe
                 breceiptdtl.setFisred("1");
                 breceiptdtl.setFisredDesc("已入账");
                 breceiptdtl.setFno(inf.getFno()); // 财务号
+                breceiptdtl.setSoOrderNo(inf.getSono());
+                breceiptdtl.setClaimAmt(inf.getClaimedAmt());
+                breceiptdtl.setPlaced("2");
+                breceiptdtl.setRlamt(inf.getClaimedAmt());
+                breceiptdtl.setZzbj("0");
+
+
 
                 // 插入明细表
                 breceiptdtlMapper.insert(breceiptdtl);

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

@@ -68,7 +68,12 @@ public class StockServiceImpl implements StockService {
                 ctrl.setSoloId(exe1.getID());       // 对应inf_exe1.id
                 ctrl.setFno(exe1.getFno());          // 对应inf_exe1.fno
                 ctrl.setStockname(exe1.getStockname());// 对应inf_exe1.stockname
-                ctrl.setStockno(exe1.getStockcode());// 对应inf_exe1.stockcode
+                if (exe1.getStockcode()!=null&& !exe1.getStockcode().isEmpty()) {
+                    ctrl.setStockno(exe1.getStockcode());// 对应inf_exe1.stockcode
+                }else {
+                    String stockno=mdkcctrlMapper.selectStockNoByName(exe1.getStockname());
+                    ctrl.setStockno(stockno);
+                }
                 ctrl.setPono(exe1.getPfno());        // 对应inf_exe1.pfno（采购合同号）
                 ctrl.setSono(exe1.getSfno());        // 对应inf_exe1.sfno（销售合同号）
                 ctrl.setFmodalid(exe1.getFmodalid());// 对应inf_exe1.fmodalid

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

@@ -80,6 +80,7 @@ public class XiaoshoujiesuankaipiaoSettleServiceImpl implements Xiaoshoujiesuank
                 saleSettle.setCreateByName(s);
                 saleSettle.setCreateTime(new Date());
                 saleSettle.setUpdateTime(new Date());
+                saleSettle.setPlaced("2");
 
                 // 我方代码
                 saleSettle.setFours(salesOrder.getFours());

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

@@ -786,7 +786,7 @@ public class PsExeExcelUtil {
         }else if (!Shujvzidian.fukuanfangshi.contains(dto.getPayment().trim())) {
             errorLogList.add("付款方式不在下拉框中");
         }
-        if (dto.getCreateBy() == null || dto.getPayment().trim().isEmpty()) {
+        if (dto.getCreateBy() == null || dto.getCreateBy().trim().isEmpty()) {
             errorLogList.add("制单人为空");
         }
 
@@ -1409,16 +1409,26 @@ public class PsExeExcelUtil {
             // 拆分规则：按【|】分隔（优先），无则按【；】，最后按【，】/空格，最多拆4段
 
             String[] ctArr = ctInfo.split("[,|；，\\s]+", 4);
-            if (ctArr.length >= 1) ctName = ctArr[0];
-            if (ctArr.length >= 2) ctInvoiceBankName = ctArr[1];
-            if (ctArr.length >= 3) ctInvoiceBankAcct = ctArr[2];
-            if (ctArr.length >= 4) ctContNm = ctArr[3];
+            if (ctArr.length >= 1) ctName = ctArr[0].trim();
+            if (ctArr.length >= 2) ctInvoiceBankName = ctArr[1].trim();
+            if (ctArr.length >= 3) ctInvoiceBankAcct = ctArr[2].trim();
+            if (ctArr.length >= 4) ctContNm = ctArr[3].trim();
             // 核心字段校验：客户名称不能为空
-            if (ctName.isEmpty()) {
+            if (ctArr.length<4){
+                errorLogList.add("客户信息（名称+银行+账号+合同名）格式错误");
+            }else if (ctName.isEmpty()) {
                 errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
             }
-            if ("无".equals(ctInvoiceBankName)||"无".equals(ctInvoiceBankAcct)) {
+            if (ctName.isEmpty()) {
+                errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
+            }else {
+                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(ctName);
+                if (gongyingshang == null) {
+                    errorLogList.add("供应商没有,需要先申请供应商; ");
+                }
+                else if ("无".equals(ctInvoiceBankName)||"无".equals(ctInvoiceBankAcct)|| "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
                     errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                }
             }
         }
 
@@ -1708,8 +1718,21 @@ public class PsExeExcelUtil {
             if (ctArr.length >= 3) ctInvoiceBankAcct = ctArr[2];
             if (ctArr.length >= 4) ctContNm = ctArr[3];
             // 核心字段校验：客户名称不能为空
+            if (ctArr.length<4){
+                errorLogList.add("客户信息（名称+银行+账号+合同名）格式错误");
+            }else if (ctName.isEmpty()) {
+                errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
+            }
             if (ctName.isEmpty()) {
                 errorLogList.add("客户名称解析失败，原始值：" + ctInfo);
+            }else {
+                Gongyingshang gongyingshang = gongyingshangMapper.selectGongyingshangByName(ctName);
+                if (gongyingshang == null) {
+                    errorLogList.add("供应商没有,需要先申请供应商; ");
+                }
+                else if ("无".equals(ctInvoiceBankName)||"无".equals(ctInvoiceBankAcct)|| "".equals(gongyingshang.getCtBankAcct())||gongyingshang.getCtBankAcct()==null) {
+                    errorLogList.add("银行名称/账号为空，需要申请客商银行信息");
+                }
             }
         }
 
@@ -1749,6 +1772,8 @@ public class PsExeExcelUtil {
         String ut = trimField(dto.getUt());
         if (ut.isEmpty()) {
             errorLogList.add("单位为空");
+        }else if (!Shujvzidian.danwei.contains(ut)){
+            errorLogList.add("单位不在下拉框中");
         }
 
         String createBy = trimField(dto.getCreateBy());