|
|
@@ -1055,6 +1055,21 @@ public class YongyouServiceImpl implements YongyouService {
|
|
|
LongYanPurchaseOrder longYanPurchaseOrder = new LongYanPurchaseOrder();
|
|
|
longYanPurchaseOrder.setYongYouId(purchaseData.getPuAppMain().getCcode());
|
|
|
LongYanPurchaseOrder order = longYanPurchaseOrderMapper.selectOne(longYanPurchaseOrder);
|
|
|
+ if (order!=null) {
|
|
|
+ LongYanPurchaseOrder udpOrder = new LongYanPurchaseOrder();
|
|
|
+ udpOrder.setStatus(5);
|
|
|
+ udpOrder.setId(order.getId());
|
|
|
+ longYanPurchaseOrderMapper.updateByPrimaryKeySelective(udpOrder);
|
|
|
+ }
|
|
|
+ LongYanPurchaseOrderMerge merge = new LongYanPurchaseOrderMerge();
|
|
|
+ merge.setYongYouId(purchaseData.getPuAppMain().getCcode());
|
|
|
+ merge = longYanPurchaseOrderMergeMapper.selectOne(merge);
|
|
|
+ if (merge!=null) {
|
|
|
+ LongYanPurchaseOrderMerge updMerge = new LongYanPurchaseOrderMerge();
|
|
|
+ updMerge.setId(merge.getId());
|
|
|
+ updMerge.setStatus(5);
|
|
|
+ longYanPurchaseOrderMergeMapper.updateByPrimaryKeySelective(updMerge);
|
|
|
+ }
|
|
|
if (order!=null){
|
|
|
List<PuAppDetails> puAppDetails = purchaseData.getPuAppDetail();
|
|
|
List<LongYanPurchaseDetail> updateList = new ArrayList<>();
|
|
|
@@ -1062,7 +1077,7 @@ public class YongyouServiceImpl implements YongyouService {
|
|
|
LongYanPurchaseDetail detail = new LongYanPurchaseDetail();
|
|
|
detail.setNo(details.getCinvcode());
|
|
|
detail.setLongYangPurchaseOrderId(order.getId());
|
|
|
- Boolean flag = false;
|
|
|
+ Boolean flag = true;
|
|
|
if (details.getFmoney()!=null){
|
|
|
detail.setFmoney(details.getFmoney());
|
|
|
flag = true;
|
