Lianxun_Java.git

			@@ -19,10 +19,12 @@
			import com.java110.utils.util.Assert;
			import com.java110.utils.util.BeanConvertUtil;
			import com.java110.utils.util.DateUtil;
			import com.java110.utils.util.StringUtil;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.http.ResponseEntity;
			import org.springframework.web.bind.annotation.*;

			import java.math.BigDecimal;
			import java.util.ArrayList;
			import java.util.List;

			@@ -93,7 +95,7 @@
			purchaseApplyDetailPos.add(purchaseApplyDetailPo);
			}
			purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
			return goodsCollectionBMOImpl.collection(purchaseApplyPo);
			return goodsCollectionBMOImpl.collection(purchaseApplyPo,reqJson);
			}

			/**
			@@ -108,6 +110,7 @@
			@RequestMapping(value = "/getCollectionAuditOrder", method = RequestMethod.GET)
			public ResponseEntity<String> getCollectionAuditOrder(@RequestParam(value = "page") int page,
			@RequestParam(value = "row") int row,
			@RequestParam(value = "communityId") String communityId,
			@RequestHeader(value = "user-id") String userId,
			@RequestHeader(value = "store-id") String storeId) {
			AuditUser auditUser = new AuditUser();
			@@ -115,10 +118,12 @@
			auditUser.setPage(page);
			auditUser.setRow(row);
			auditUser.setStoreId(storeId);
			auditUser.setCommunityId(communityId);
			return getCollectionAuditOrderBMOImpl.auditOrder(auditUser);
			}

			/**
			* 物品发放(物品发放之后直接到个人手中)
			* {"resourceOuts":[],"applyOrderId":"152020071665420001","taskId":"237506","resOrderType":"20000",
			* "purchaseApplyDetailVo":[{"applyOrderId":"152020071665420001","id":"152020071690120002","price":"","quantity":"1",
			* "resCode":"002","resId":"852020070239060001","resName":"水性笔","stock":"2","purchaseQuantity":"2","purchaseRemark":""}]}
			@@ -176,21 +181,37 @@
			purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
			purchaseApplyDetailPo.setQuantity(purchaseApplyDetailPo.getPurchaseQuantity());
			purchaseApplyDetailPo.setRemark("直接出库");
			purchaseApplyDetailPo.setOriginalStock(resourceStore.get("stock").toString());
			purchaseApplyDetailPo.setOriginalStock(resourceStore.getString("stock"));
			purchaseApplyDetailPos.add(purchaseApplyDetailPo);
			//调整总库存
			ResourceStorePo resourceStorePo = new ResourceStorePo();
			resourceStorePo.setResId(purchaseApplyDetailPo.getResId());
			resourceStorePo.setStock("-" + purchaseApplyDetailPo.getPurchaseQuantity());
			resourceStorePo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_OUT);
			//计算出库后的最小计量总数
			BigDecimal oldMiniStock = new BigDecimal(resourceStore.getString("miniStock")); //获取原先的最小计量总数
			BigDecimal oldMiniUnitStock = new BigDecimal(resourceStore.getString("miniUnitStock")); //获取最小计量单位数量
			BigDecimal nowQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity()); //获取出库数量
			BigDecimal nowMiniStock = nowQuantity.multiply(oldMiniUnitStock); //计算当前出库的最小计量总数
			BigDecimal surplusMiniStock = oldMiniStock.subtract(nowMiniStock);
			if (surplusMiniStock.compareTo(BigDecimal.ZERO) == -1) {
			throw new IllegalArgumentException("物品库存已经不足，请确认物品库存！");
			}
			resourceStorePo.setMiniStock(String.valueOf(surplusMiniStock));
			resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
			//查询资源
			ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
			resourceStoreDto.setResId(purchaseApplyDetailPo.getResId());
			List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
			if (resourceStoreDtos == null \|\| resourceStoreDtos.size() < 1) {
			continue;
			throw new IllegalArgumentException("未查询到物品资源信息！");
			}
			//获取物品单位
			String unitCode = resourceStoreDtos.get(0).getUnitCode();
			//获取物品最小计量单位
			String miniUnitCode = resourceStoreDtos.get(0).getMiniUnitCode();
			//获取物品最小计量单位数量
			String miniUnitStock = resourceStoreDtos.get(0).getMiniUnitStock();
			//入库到个人仓库中
			UserStorehousePo userStorehousePo = new UserStorehousePo();
			userStorehousePo.setUsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));
			@@ -198,23 +219,56 @@
			userStorehousePo.setResName(resourceStoreDtos.get(0).getResName());
			userStorehousePo.setStoreId(resourceStoreDtos.get(0).getStoreId());
			userStorehousePo.setUserId(purchaseApplyPo.getUserId());
			//查询物品是否已经存在

			//查询个人物品仓库中是否已经存在商品
			UserStorehouseDto userStorehouseDto = new UserStorehouseDto();
			userStorehouseDto.setResId(resourceStoreDtos.get(0).getResId());
			userStorehouseDto.setResCode(resourceStoreDtos.get(0).getResCode());
			userStorehouseDto.setUserId(purchaseApplyPo.getUserId());
			userStorehouseDto.setStoreId(resourceStoreDtos.get(0).getStoreId());
			List<UserStorehouseDto> userStorehouseDtos = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouseDto);
			userStorehousePo.setResCode(resourceStoreDtos.get(0).getResCode());
			if (userStorehouseDtos == null \|\| userStorehouseDtos.size() < 1) {
			userStorehousePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
			if (!StringUtil.isEmpty(unitCode) && !StringUtil.isEmpty(miniUnitCode) && !StringUtil.isEmpty(miniUnitStock) && !unitCode.equals(miniUnitCode)) {
			//获取领取数量
			BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());
			//计算个人物品最小计量总数
			BigDecimal miniUnitStock1 = new BigDecimal(miniUnitStock);
			BigDecimal quantity = purchaseQuantity.multiply(miniUnitStock1);
			userStorehousePo.setMiniStock(String.valueOf(quantity));
			} else {
			userStorehousePo.setMiniStock(purchaseApplyDetailPo.getPurchaseQuantity());
			}
			userStorehouseInnerServiceSMOImpl.saveUserStorehouses(userStorehousePo);
			} else {
			int total = Integer.parseInt(purchaseApplyDetailPo.getPurchaseQuantity()) + Integer.parseInt(userStorehouseDtos.get(0).getStock());
			//获取个人物品领用后的库存
			BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());
			BigDecimal stock1 = new BigDecimal(userStorehouseDtos.get(0).getStock());
			BigDecimal total = purchaseQuantity.add(stock1);
			userStorehousePo.setStock(total + "");
			userStorehousePo.setUsId(userStorehouseDtos.get(0).getUsId());
			if (!StringUtil.isEmpty(unitCode) && !StringUtil.isEmpty(miniUnitCode) && !StringUtil.isEmpty(miniUnitStock) && !unitCode.equals(miniUnitCode)) {
			//获取本次领取数量
			BigDecimal miniUnitStock1 = new BigDecimal(miniUnitStock);
			//计算本次领取的个人物品最小计量总数
			BigDecimal quantity = purchaseQuantity.multiply(miniUnitStock1);
			BigDecimal miniStock = new BigDecimal(0);
			//获取个人物品原先的最小计量总数
			if (StringUtil.isEmpty(userStorehouseDtos.get(0).getMiniStock())) {
			throw new IllegalArgumentException("信息错误，个人物品最小计量总数不能为空！");
			} else {
			miniStock = new BigDecimal(userStorehouseDtos.get(0).getMiniStock());
			}
			//计算领用后个人物品总的最小计量总数
			BigDecimal miniQuantity = quantity.add(miniStock);
			userStorehousePo.setMiniStock(String.valueOf(miniQuantity));
			} else {
			userStorehousePo.setMiniStock(String.valueOf(total));
			}
			userStorehouseInnerServiceSMOImpl.updateUserStorehouses(userStorehousePo);
			}
			}
			purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
			return goodsCollectionBMOImpl.collection(purchaseApplyPo);
			return goodsCollectionBMOImpl.collection(purchaseApplyPo,reqJson);
			}
			}