Lianxun_Java.git

old mode 100644 new mode 100755

			@@ -18,7 +18,6 @@
			import org.springframework.web.bind.annotation.*;

			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			@RestController
			@@ -71,6 +70,7 @@
			for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
			JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
			resourceStore.remove("price");//采购价格默认空
			resourceStore.put("originalStock",resourceStore.get("stock"));
			PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
			purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
			purchaseApplyDetailPos.add(purchaseApplyDetailPo);
			@@ -97,6 +97,7 @@
			purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
			return resourceEnterBMOImpl.enter(purchaseApplyPo);
			}

			/**
			* 直接入库操作
			* <p>
			@@ -109,9 +110,9 @@
			*/
			@RequestMapping(value = "/purchaseStorage", method = RequestMethod.POST)
			public ResponseEntity<String> purchaseStorage(@RequestBody JSONObject reqJson,
			@RequestHeader(value = "user-id") String userId,
			@RequestHeader(value = "user-name") String userName,
			@RequestHeader(value = "store-id") String storeId) {
			@RequestHeader(value = "user-id") String userId,
			@RequestHeader(value = "user-name") String userName,
			@RequestHeader(value = "store-id") String storeId) {
			Assert.hasKeyAndValue(reqJson, "resourceStores", "必填，请填写申请采购的物资");
			Assert.hasKeyAndValue(reqJson, "description", "必填，请填写采购申请说明");
			Assert.hasKeyAndValue(reqJson, "resOrderType", "必填，请填写申请类型");
			@@ -124,7 +125,7 @@
			purchaseApplyPo.setEndUserTel(reqJson.getString("endUserTel"));
			purchaseApplyPo.setStoreId(storeId);
			purchaseApplyPo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
			purchaseApplyPo.setState(PurchaseApplyDto.STATE_AUDITED);
			purchaseApplyPo.setState(PurchaseApplyDto.STATE_END);
			purchaseApplyPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
			purchaseApplyPo.setDescription("直接采购入库");
			purchaseApplyPo.setCreateUserId(userId);
			@@ -137,12 +138,15 @@
			PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
			purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
			purchaseApplyDetailPo.setRemark("直接采购入库");
			purchaseApplyDetailPo.setOriginalStock(resourceStore.get("stock").toString());
			purchaseApplyDetailPo.setQuantity(purchaseApplyDetailPo.getPurchaseQuantity());
			purchaseApplyDetailPos.add(purchaseApplyDetailPo);
			//增加库存
			ResourceStorePo resourceStorePo = new ResourceStorePo();
			resourceStorePo.setPurchasePrice(purchaseApplyDetailPo.getPrice());
			resourceStorePo.setResId(purchaseApplyDetailPo.getResId());
			resourceStorePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
			resourceStorePo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
			resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
			}
			purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);