1 货值暂估添加合同字段，添加商品库字段，修改截取字段

2 出入库删除空指针控制，订单为空不准许入库

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

@@ -22,4 +22,18 @@ public interface ShangpinkuMapper extends BaseMapper<Shangpinku> {
             "        and a.itemno = #{itemno}")
     Shangpinku selectByItemno(String itemno);
 
+
+    @Select("select b.type_name2,\n" +
+            "        a.itemno,\n" +
+            "        a.sdesc,\n" +
+            "        a.brand\n" +
+            "        from SGGMIIP.invitem a\n" +
+            "        left join (select fno, type_name type_name2\n" +
+            "        from SGGMIIP.product_category\n" +
+            "        where nvl(del_flag, 0) != 1\n" +
+            "        and level = 0\n" +
+            "        and parent_id = 0) b on SUBSTR(a.itemno, 1, 2) = b.fno\n" +
+            "        where ifnull(a.del_flag, 0) != 1\n" +
+            "        and a.sdesc = #{sdesc} limit 1")
+    Shangpinku selectBySdesc(String sdesc);
 }

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

@@ -1,17 +1,14 @@
 package com.example.backend.pAndSExe.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.example.backend.pAndSExe.mapper.InfHuozhizanguMapper;
-import com.example.backend.pAndSExe.mapper.ProvInMapper;
-import com.example.backend.pAndSExe.mapper.ProvInDtlMapper;
-import com.example.backend.pAndSExe.model.InfHuozhizangu;
-import com.example.backend.pAndSExe.model.ProvIn;
-import com.example.backend.pAndSExe.model.ProvInDtl;
+import com.example.backend.pAndSExe.mapper.*;
+import com.example.backend.pAndSExe.model.*;
 import com.example.backend.pAndSExe.service.HuozhizanguSettleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -26,6 +23,21 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
     @Autowired
     private ProvInDtlMapper provInDtlMapper;
 
+    @Autowired
+    private MdkcctrlMapper mdkcctrlMapper;
+
+    @Autowired
+    private PurchaseorderMapper purchaseorderMapper;
+
+    @Autowired
+    private PurchasecontractMapper purchasecontractMapper;
+
+    @Autowired
+    private POrderDtlMapper pOrderDtlMapper;
+
+    @Autowired
+    private ShangpinkuMapper shangpinkuMapper;
+
     @Transactional(rollbackFor = Exception.class)
     public String importHuozhizanguInfToSettle() {
         List<InfHuozhizangu> infList = infHuozhizanguMapper.selectValidData();
@@ -38,6 +50,9 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
 
         for (InfHuozhizangu inf : infList) {
             try {
+                PurchaseOrder purchaseOrder = purchaseorderMapper.selectByPurchaseContract(inf.getPono());
+                Purchasecontract purchasecontract = purchasecontractMapper.selectByFno(inf.getPono());
+
                 ProvIn provIn = new ProvIn();
                 Long provInId = IdWorker.getId();
                 provIn.setId(provInId);
@@ -45,8 +60,24 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
                 provIn.setCurcy(inf.getCurcy());
                 provIn.setQichu("1");
                 provIn.setSoloid(inf.getId());
+                provIn.setPlaced("2");
+                provIn.setCreateBy(purchaseOrder.getCreateBy());
+                provIn.setCreateByName(purchaseOrder.getCreateByName());
+                provIn.setFours(purchasecontract.getFours());
+                provIn.setFoursname(purchasecontract.getFoursname());
+                provIn.setSupCode(purchasecontract.getSupcode());
+                provIn.setSupName(purchasecontract.getSupname());
+                provIn.setServiceType(purchasecontract.getServicetype());
+                provIn.setBizType(purchasecontract.getBiztype());
+                provIn.setBizProductType(purchasecontract.getBizproducttype());
+                provIn.setDelFlag(0);
+                provIn.setFno(inf.getFno());
+                provIn.setCreateTime(new Date());
                 provInMapper.insert(provIn);
 
+
+                Shangpinku shangpinku=shangpinkuMapper.selectBySdesc(inf.getSdesc());
+
                 ProvInDtl provInDtl = new ProvInDtl();
                 Long dtlId = IdWorker.getId();
                 provInDtl.setId(dtlId);
@@ -60,6 +91,12 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
                 provInDtl.setPoPrice(inf.getPoPrice());
                 provInDtl.setPoAmt(inf.getPoAmt());
                 provInDtl.setCurcy(inf.getCurcy());
+                provInDtl.setPono(inf.getPono());
+                provInDtl.setItemno(shangpinku.getItemno());
+                provInDtl.setFno(inf.getFno());
+                provInDtl.setPoOrderNo(inf.getPono());
+                provInDtl.setCurcypo(inf.getCurcy());
+
                 provInDtlMapper.insert(provInDtl);
 
                 infHuozhizanguMapper.updateStatusById(inf.getId());

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

@@ -47,6 +47,8 @@ public class PsExeServiceImpl implements PsExeService {
     private InfFeiyongjiesuandengjiMapper infFeiyongjiesuandengjiMapper;
     @Autowired
     private InfDailijiesuanMapper infDailijiesuanMapper;
+    @Autowired
+    private InfHuozhizanguMapper infHuozhizanguMapper;
 
     @Autowired
     private PsExeExcelUtil psExeExcelUtil;
@@ -63,7 +65,8 @@ public class PsExeServiceImpl implements PsExeService {
         InfShoukuanrenling("收款认领", InfShoukuanrenling.class), // 索引7
         InfXiaoshoujiesuankaipiao("销售结算开票", InfXiaoshoujiesuankaipiao.class), // 索引8
         //InfFeiyongjiesuandengji("费用结算登记", InfFeiyongjiesuandengji.class), // 索引9
-        InfDailijiesuan("代理结算", InfDailijiesuan.class); // 索引10
+        InfDailijiesuan("代理结算", InfDailijiesuan.class), // 索引10
+        InfHuozhizangu("货值暂估", InfHuozhizangu.class); // 索引10
 
         private final String sheetName;
         private final Class<?> entityClass;
@@ -232,6 +235,13 @@ public class PsExeServiceImpl implements PsExeService {
                     successCount++;
                 }
                 break;
+            case InfHuozhizangu: // 代理结算（同样移除dataStatus判断）
+                List<InfHuozhizangu> agentHuozhizanguList = (List<InfHuozhizangu>) entityList;
+                for (InfHuozhizangu entity : agentHuozhizanguList) {
+                    infHuozhizanguMapper.insert(entity);
+                    successCount++;
+                }
+                break;
 
             default:
                 logger.error("未知业务类型：{}，无法入库", bizType);

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

@@ -101,7 +101,7 @@ public class StockServiceImpl implements StockService {
                     purchasecontract=mdkcctrlMapper.selectFoursnameByPono(exe1.getPfno());
                     String pono =purchasecontract.getFno();
                     purchaseOrder=purchaseorderMapper.selectByPurchaseContract(pono);
-                    if (purchaseOrder!=null) {
+
                         ctrl.setFours(purchaseOrder.getFours());
                         ctrl.setFoursname(purchaseOrder.getFoursname());
                         ctrl.setAcctSet(purchaseOrder.getAcctSet());
@@ -111,13 +111,13 @@ public class StockServiceImpl implements StockService {
                         ctrl.setServiceType(purchaseOrder.getServiceType());
                         ctrl.setBizType(purchaseOrder.getBizType());
                         ctrl.setBizProductType(purchaseOrder.getBizProductType());
-                        ctrl.setFcat(1);
 
-                    }
+
+                    ctrl.setFcat(1);
                 }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());
                         ctrl.setAcctSet(salesOrder.getAcctSet());
@@ -136,8 +136,9 @@ public class StockServiceImpl implements StockService {
                         ctrl.setRateUsd(salesOrder.getRateUsd());
                         ctrl.setRate(salesOrder.getRate());
                         ctrl.setTrdCtry(salesOrder.getTrdCtry());
-                        ctrl.setFcat(-1);
-                    }
+
+
+                    ctrl.setFcat(-1);
                 }
                 //插入主表
                 mdkcctrlMapper.insert(ctrl);
@@ -260,4 +261,4 @@ public class StockServiceImpl implements StockService {
         return String.format("inf_exe1数据导入业务表完成：总条数=%d，成功=%d，失败=%d",
                 infExe1List.size(), successCount, failCount);
     }
-}
+}

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

@@ -2045,7 +2045,7 @@ public class PsExeExcelUtil {
         entity.setNtPoPrice(ntPoPrice);
         entity.setPoPrice(poPrice);
         entity.setPoAmt(poAmt);
-        entity.setCurcy(curcy);
+        entity.setCurcy(curcy.split("-")[0]);
         entity.setInTaxRate(inTaxRate);
 
         // 生成流水号（HZ+年月+6位自增ID）