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

@@ -68,10 +68,11 @@ 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
+                String stockno="";
                 if (exe1.getStockcode()!=null&& !exe1.getStockcode().isEmpty()) {
                     ctrl.setStockno(exe1.getStockcode());// 对应inf_exe1.stockcode
                 }else {
-                    String stockno=mdkcctrlMapper.selectStockNoByName(exe1.getStockname());
+                    stockno=mdkcctrlMapper.selectStockNoByName(exe1.getStockname());
                     ctrl.setStockno(stockno);
                 }
                 ctrl.setPono(exe1.getPfno());        // 对应inf_exe1.pfno（采购合同号）
@@ -143,6 +144,8 @@ public class StockServiceImpl implements StockService {
                         ctrl.setRateUsd(salesOrder.getRateUsd());
                         ctrl.setRate(salesOrder.getRate());
                         ctrl.setTrdCtry(salesOrder.getTrdCtry());
+                        ctrl.setStockname(exe1.getStockname());
+                        ctrl.setStockno(stockno);
 
 
                     ctrl.setFcat(-1);