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);
			@@ -138,6 +138,7 @@
			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);
			//增加库存
			@@ -145,6 +146,7 @@
			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);