ERP_override.git

			@@ -93,6 +93,7 @@
			//删除材料出库明细的数据
			materialInventoryMapper.deleteMaterialOutboundDetail(materialOutboundId);
			materialInventoryMapper.updateMaterialOutbound(materialOutbound, materialOutboundId);
			materialInventoryMapper.deleteMaterialLog(materialOutboundId);
			oddNumber = materialOutboundId;
			log.setFunction("saveMaterialOutbound修改:"+oddNumber);
			} else {
			@@ -114,9 +115,12 @@
			materialInventoryMapper.insertMaterialOutboundDetail(materialOutboundDetail, oddNumber, materialOutboundDetailMaximum + 1);
			//修改物料库存表出库数量
			materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
			String projectNo="";
			if(materialOutboundDetail.getUseId()!=null){
			projectNo = materialInventoryMapper.selectProjectNo(materialOutboundDetail.getUseId());
			//修改优化工程表出库数量
			materialInventoryMapper.updateMaterialInventoryAvailableOptOut(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());

			}/*else{
			//修改物料库存表出库数量
			materialInventoryMapper.updateMaterialInventoryAvailableOut(materialOutboundDetail.getId(), materialOutboundDetail.getOutboundQuantity());
			@@ -140,6 +144,7 @@
			materialLog.setInventoryId(materialOutboundDetail.getId());
			materialLog.setInventoryArea(materialInventory.getInventoryArea());
			materialLog.setRemarks(materialOutboundDetail.getRemarks());
			materialLog.setProjectNo(projectNo);
			materialLog.setOperator(object.get("userName").toString());
			materialLog.setOperateTime(LocalDate.now());
			materialLogMapper.insert(materialLog);
			@@ -163,7 +168,7 @@
			sysError.setError(e+Arrays.toString(e.getStackTrace()));
			sysError.setFunc("saveMaterialOutbound");
			sysErrorService.insert(sysError);
			saveState = "false1";
			saveState = "false";

			}
			return saveState;
			@@ -338,7 +343,10 @@
			for (MaterialOutboundDetail materialOutboundDetail : materialOutboundDetailLists) {
			//还原物料库存数
			materialInventoryMapper.updateMaterialInventoryAvailableInt(materialOutboundDetail.getInventoryId(), materialOutboundDetail.getOutboundQuantity());

			if(materialOutboundDetail.getUseId()!=null){
			//还原优化工程库存数
			materialInventoryMapper.updateMaterialInventoryAvailableOptInt(materialOutboundDetail.getUseId(), materialOutboundDetail.getOutboundQuantity());
			}
			}
			}