Lianxun_Java.git

old mode 100755 new mode 100644

			@@ -3,9 +3,9 @@
			import com.java110.core.base.smo.BaseServiceSMO;
			import com.java110.dto.PageDto;
			import com.java110.dto.file.FileRelDto;
			import com.java110.dto.purchaseApply.PurchaseApplyDto;
			import com.java110.dto.resourceStore.ResourceStoreDto;
			import com.java110.dto.resourceStoreTimes.ResourceStoreTimesDto;
			import com.java110.dto.purchase.PurchaseApplyDto;
			import com.java110.dto.resource.ResourceStoreDto;
			import com.java110.dto.resource.ResourceStoreTimesDto;
			import com.java110.intf.common.IFileRelInnerServiceSMO;
			import com.java110.intf.store.IResourceStoreInnerServiceSMO;
			import com.java110.intf.store.IResourceStoreTimesV1InnerServiceSMO;
			@@ -115,8 +115,9 @@
			throw new IllegalArgumentException("库存不足，参数有误");
			}
			//入库操作对物品进行加权平均
			if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.RES_ORDER_TYPE_ENTER)
			\|\| (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE))) {
			if (PurchaseApplyDto.RES_ORDER_TYPE_ENTER.equals(resourceStorePo.getResOrderType())
			\|\| (PurchaseApplyDto.WAREHOUSING_TYPE_URGENT.equals(resourceStorePo.getResOrderType())
			&& PurchaseApplyDto.WEIGHTED_MEAN_TRUE.equals(resourceStorePo.getOperationType()))) {
			//获取原均价
			Object averageOldPrice = stores.get(0).get("averagePrice");
			BigDecimal price = new BigDecimal(0);
			@@ -130,15 +131,20 @@
			BigDecimal averagePrice = averagePriceTotal.divide(totalStock, 2, BigDecimal.ROUND_HALF_UP);
			resourceStorePo.setAveragePrice(averagePrice.toString());
			}
			if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE)) {
			if (PurchaseApplyDto.WAREHOUSING_TYPE_URGENT.equals(resourceStorePo.getResOrderType())
			&& PurchaseApplyDto.WEIGHTED_MEAN_TRUE.equals(resourceStorePo.getOperationType())) {
			resourceStorePo.setStock(stock + "");
			} else {
			resourceStorePo.setStock(totalStock + "");
			}
			resourceStorePo.setStatusCd("0");
			//计算最小计量总数
			BigDecimal miniUnitStock = new BigDecimal(stores.get(0).get("miniUnitStock").toString());//最小计量单位数量
			BigDecimal newMiniStock = totalStock.multiply(miniUnitStock);
			resourceStorePo.setMiniStock(String.valueOf(newMiniStock));
			return resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance(BeanConvertUtil.beanCovertMap(resourceStorePo));
			} finally {
			DistributedLock.releaseDistributedLock(requestId, key);
			DistributedLock.releaseDistributedLock(key, requestId);
			}
			}