From 1024666b99a24bd7d5e4dc442d6b0c0319fa2f29 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 22:56:48 +0800
Subject: [PATCH] 1、优化细节性问题2、优化采购细节问题
---
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
index 972acd6..e3e8398 100755
--- a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
@@ -99,7 +99,8 @@
throw new IllegalArgumentException("搴撳瓨涓嶈冻锛屽弬鏁版湁璇�");
}
//鍏ュ簱鎿嶄綔 瀵圭墿鍝佽繘琛屽姞鏉冨钩鍧�
- if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.RES_ORDER_TYPE_ENTER)) {
+ if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.RES_ORDER_TYPE_ENTER)
+ || (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE))) {
//鑾峰彇鍘熷潎浠�
Object averageOldPrice = stores.get(0).get("averagePrice");
Double price = 0.0;
@@ -115,7 +116,11 @@
double f0 = b0.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
resourceStorePo.setAveragePrice(String.valueOf(f0));
}
- resourceStorePo.setStock(totalStock + "");
+ if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE)) {
+ resourceStorePo.setStock(stock + "");
+ } else {
+ resourceStorePo.setStock(totalStock + "");
+ }
resourceStorePo.setStatusCd("0");
return resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance(BeanConvertUtil.beanCovertMap(resourceStorePo));
} finally {
@@ -123,6 +128,16 @@
}
}
+ /**
+ * 鏂板鐗╁搧
+ *
+ * @param resourceStoreDto
+ */
+ @Override
+ public void saveResourceStore(@RequestBody ResourceStoreDto resourceStoreDto) {
+ resourceResourceStoreServiceDaoImpl.saveResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceStoreDto));
+ }
+
public IResourceStoreServiceDao getResourceStoreServiceDaoImpl() {
return resourceResourceStoreServiceDaoImpl;
}
--
Gitblit v1.8.0