|
@@ -58,15 +58,8 @@ public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemSe
|
|
|
for (BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem item : sapOrderItemList) {
|
|
|
|
|
|
try {
|
|
|
- QrPackageSapOrderItem sapOrderItem = new QrPackageSapOrderItem();
|
|
|
- sapOrderItem.setSapOrderNo(item.getSapOrderNo());
|
|
|
- sapOrderItem.setSapMaterialId(item.getSapMaterialId());
|
|
|
- sapOrderItem.setSapCoverFactoryId(item.getSapCoverFactoryId());
|
|
|
- sapOrderItem.setSapBeerFactoryId(item.getSapBeerFactoryId());
|
|
|
- sapOrderItem.setSapMaterialName(item.getSapMaterialName());
|
|
|
- sapOrderItem.setPurchaseCount(item.getPurchaseCount());
|
|
|
|
|
|
- updateQrPackageSapOrderItem(sapOrderItem);
|
|
|
+ updateQrPackageSapOrderItem(item);
|
|
|
} catch (Exception e) {
|
|
|
|
|
|
log.error("修改Sap订单明细数据失败",e);
|
|
@@ -89,18 +82,37 @@ public class QrPackageSapOrderItemServiceImpl implements QrPackageSapOrderItemSe
|
|
|
|
|
|
}
|
|
|
|
|
|
- private void updateQrPackageSapOrderItem(QrPackageSapOrderItem sapOrderItem) {
|
|
|
+ private void updateQrPackageSapOrderItem(BatchImportPackageSapOrderItemReq.BatchImportSapOrderItem item) {
|
|
|
|
|
|
-
|
|
|
- QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
|
|
|
+
|
|
|
+ QrPackageSapOrderItem qrPackageSapOrderItem = getQrPackageSapOrderItemInfo(item.getSapOrderNo(),item.getSapMaterialId());
|
|
|
|
|
|
if (ObjectUtil.isNull(qrPackageSapOrderItem)) {
|
|
|
- log.info("Sap物料订单明细订单号:{}sap物料id:{}不存在",sapOrderItem.getSapOrderNo(),sapOrderItem.getSapMaterialId());
|
|
|
+ log.info("Sap物料订单明细订单号:{}sap物料id:{}不存在",item.getSapOrderNo(),item.getSapMaterialId());
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
+ QrPackageSapOrderItem sapOrderItem = new QrPackageSapOrderItem();
|
|
|
+ sapOrderItem.setSapOrderNo(item.getSapOrderNo());
|
|
|
+ sapOrderItem.setSapMaterialId(item.getSapMaterialId());
|
|
|
+ sapOrderItem.setSapCoverFactoryId(item.getSapCoverFactoryId());
|
|
|
+ sapOrderItem.setSapBeerFactoryId(item.getSapBeerFactoryId());
|
|
|
+ sapOrderItem.setSapMaterialName(item.getSapMaterialName());
|
|
|
sapOrderItem.setId(qrPackageSapOrderItem.getId());
|
|
|
- sapOrderItem.setUpdateTime(LocalDateTime.now());
|
|
|
+
|
|
|
+
|
|
|
+ if (qrPackageSapOrderItem.getSapMaterialId().equals(item.getOriSapMaterialId())) {
|
|
|
+ sapOrderItem.setPurchaseCount((item.getPurchaseCount() - item.getOriPurchaseCount()) + qrPackageSapOrderItem.getPurchaseCount());
|
|
|
+ } else {
|
|
|
+
|
|
|
+ long purchaseCount = (qrPackageSapOrderItem.getPurchaseCount() - item.getOriPurchaseCount()) + item.getPurchaseCount();
|
|
|
+
|
|
|
+ if (purchaseCount == 0) {
|
|
|
+ qrPackageSapOrderItemMapper.deleteById(qrPackageSapOrderItem.getId());
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ sapOrderItem.setPurchaseCount(purchaseCount);
|
|
|
+ }
|
|
|
qrPackageSapOrderItemMapper.updateById(sapOrderItem);
|
|
|
}
|
|
|
|