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

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

src/main/java/com/example/backend/pAndSExe/controller/PsExeController.java

@@ -53,6 +53,8 @@ public class PsExeController {
 
     @Autowired
     private DailijiesuanSettleService dailijiesuanSettleService;
+    @Autowired
+    private HuozhizanguSettleService huozhizanguSettleService;
 
     /**
      * 1. 导入采、销执行表Excel文件（单独）
@@ -81,6 +83,7 @@ public class PsExeController {
             resultMsg.append("收款认领结算业务：").append(shoukuanrenlingSettleService.importShoukuanrenlingInfToSettle()).append("；");
             resultMsg.append("销售结算开票业务：").append(xiaoshoujiesuankaipiaoSettleService.importXiaoshoujiesuankaipiaoInfToSettle()).append("；");
             resultMsg.append("代理结算业务：").append(dailijiesuanSettleService.importDailijiesuanInfToSettle()).append("；");
+            resultMsg.append("货值暂估业务：").append(huozhizanguSettleService.importHuozhizanguInfToSettle()).append("；");
             return Result.success(resultMsg.toString(), "所有业务批量导入成功");
         } catch (Exception e) {
             logger.error("所有业务批量导入失败", e);

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

@@ -17,7 +17,7 @@ public interface InfHuozhizanguMapper extends BaseMapper<InfHuozhizangu> {
     List<InfHuozhizangu> selectValidData();
 
 
-    @Update("UPDATE SGGMINFT.INF_JINXIANGFAPIAO SET dataStatus = '1' WHERE ID = #{id}")
+    @Update("UPDATE SGGMINFT.INF_HUOZHIZANGU SET dataStatus = '1' WHERE ID = #{id}")
 
     void updateStatusById(String id);
 }

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

@@ -18,4 +18,6 @@ public interface PurchasecontractMapper extends BaseMapper
     @Select("select sdesc from SGGMIIP.purchaseDtl where rid =#{id} and del_flag != '1' limit 1")
     String selectSdesc(Long id);
 
+    @Select("select id from SGGMIIP.purchaseDtl where rid =#{id} and itemno =#{itemno} and del_flag != '1' limit 1")
+    Long selectDtlIdByIdAndItemNo(Long id, String itemno);
 }

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

@@ -32,6 +32,7 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
     @Autowired
     private PurchasecontractMapper purchasecontractMapper;
 
+
     @Autowired
     private POrderDtlMapper pOrderDtlMapper;
 
@@ -53,6 +54,8 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
                 PurchaseOrder purchaseOrder = purchaseorderMapper.selectByPurchaseContract(inf.getPono());
                 Purchasecontract purchasecontract = purchasecontractMapper.selectByFno(inf.getPono());
 
+
+
                 ProvIn provIn = new ProvIn();
                 Long provInId = IdWorker.getId();
                 provIn.setId(provInId);
@@ -77,6 +80,8 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
 
 
                 Shangpinku shangpinku=shangpinkuMapper.selectBySdesc(inf.getSdesc());
+                Long purchaseDtlId=purchasecontractMapper.selectDtlIdByIdAndItemNo(purchasecontract.getId(),shangpinku.getItemno());
+
 
                 ProvInDtl provInDtl = new ProvInDtl();
                 Long dtlId = IdWorker.getId();
@@ -96,6 +101,8 @@ public class HuozhizanguSettleServiceImpl implements HuozhizanguSettleService {
                 provInDtl.setFno(inf.getFno());
                 provInDtl.setPoOrderNo(inf.getPono());
                 provInDtl.setCurcypo(inf.getCurcy());
+                provInDtl.setPoid(purchaseDtlId);
+
 
                 provInDtlMapper.insert(provInDtl);