|
|
@@ -68,10 +68,11 @@ public class StockServiceImpl implements StockService {
|
|
68
|
68
|
ctrl.setSoloId(exe1.getID()); // 对应inf_exe1.id
|
|
69
|
69
|
ctrl.setFno(exe1.getFno()); // 对应inf_exe1.fno
|
|
70
|
70
|
ctrl.setStockname(exe1.getStockname());// 对应inf_exe1.stockname
|
|
|
71
|
+ String stockno="";
|
|
71
|
72
|
if (exe1.getStockcode()!=null&& !exe1.getStockcode().isEmpty()) {
|
|
72
|
73
|
ctrl.setStockno(exe1.getStockcode());// 对应inf_exe1.stockcode
|
|
73
|
74
|
}else {
|
|
74
|
|
- String stockno=mdkcctrlMapper.selectStockNoByName(exe1.getStockname());
|
|
|
75
|
+ stockno=mdkcctrlMapper.selectStockNoByName(exe1.getStockname());
|
|
75
|
76
|
ctrl.setStockno(stockno);
|
|
76
|
77
|
}
|
|
77
|
78
|
ctrl.setPono(exe1.getPfno()); // 对应inf_exe1.pfno(采购合同号)
|
|
|
@@ -143,6 +144,8 @@ public class StockServiceImpl implements StockService {
|
|
143
|
144
|
ctrl.setRateUsd(salesOrder.getRateUsd());
|
|
144
|
145
|
ctrl.setRate(salesOrder.getRate());
|
|
145
|
146
|
ctrl.setTrdCtry(salesOrder.getTrdCtry());
|
|
|
147
|
+ ctrl.setStockname(exe1.getStockname());
|
|
|
148
|
+ ctrl.setStockno(stockno);
|
|
146
|
149
|
|
|
147
|
150
|
|
|
148
|
151
|
ctrl.setFcat(-1);
|