|
@@ -19,6 +19,7 @@ import com.gree.mall.manager.zfire.bean.ZfireParamBean;
|
|
|
import com.gree.mall.manager.zfire.util.FieldUtils;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -150,8 +151,8 @@ public class WebsitPurchaseAdjustmentLogic {
|
|
|
.set(WebsitPurchaseAdjustment::getUpdateBy, adminUser.getNickName())
|
|
|
.set(WebsitPurchaseAdjustment::getUpdateTime, DateUtil.date())
|
|
|
.set(WebsitPurchaseAdjustment::getRemark, purchaseAdjustmentBean.getRemark())
|
|
|
- .set(WebsitPurchaseAdjustment::getStorageId, purchaseAdjustmentBean.getStorageId())
|
|
|
- .set(WebsitPurchaseAdjustment::getStorageName, purchaseAdjustmentBean.getStorageName())
|
|
|
+ .set(StringUtils.isNotBlank(purchaseAdjustmentBean.getStorageId()), WebsitPurchaseAdjustment::getStorageId, purchaseAdjustmentBean.getStorageId())
|
|
|
+ .set(StringUtils.isNotBlank(purchaseAdjustmentBean.getStorageName()), WebsitPurchaseAdjustment::getStorageName, purchaseAdjustmentBean.getStorageName())
|
|
|
.update();
|
|
|
// 更新明细
|
|
|
websitPurchaseAdjustmentItemService.updateBatchById(purchaseAdjustmentBean.getItems());
|